Clean up navigation drawer inheritance
Merge pull request #415 from timrae/navigationDrawerInheritance

Clean up navigation drawer inheritance