updated navigation drawer and related files
Merge remote-tracking branch 'origin/master'