Clone NavigationActivity in preparation for inclusion of ViewPager
Merge remote-tracking branch 'origin/master'