Navigation Drawer bug fixed
Maps test implemented
Merge remote-tracking branch 'origin/master'