Merge remote-tracking branch 'remotes/kalikaneko/feature/add-logo' into develop
authordrebs <drebs@leap.se>
Mon, 6 Jan 2014 16:52:13 +0000 (14:52 -0200)
committerdrebs <drebs@leap.se>
Mon, 6 Jan 2014 16:52:13 +0000 (14:52 -0200)

Trivial merge