Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 29 May 2015 11:46:30 +0000 (13:46 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 29 May 2015 11:46:30 +0000 (13:46 +0200)

Trivial merge