Merge branch 'develop' into navigation_drawer
authormasensio <masensio@solidgear.es>
Mon, 18 May 2015 13:04:15 +0000 (15:04 +0200)
committermasensio <masensio@solidgear.es>
Mon, 18 May 2015 13:04:15 +0000 (15:04 +0200)

Trivial merge