Merge branch 'feature/design' into develop
authorChocobozzz <florian.bigard@gmail.com>
Mon, 11 Dec 2017 10:06:32 +0000 (11:06 +0100)
committerChocobozzz <florian.bigard@gmail.com>
Mon, 11 Dec 2017 10:06:32 +0000 (11:06 +0100)

Trivial merge