change controllers to have different methods of hiding the nav bar
Merge remote-tracking branch 'origin/master'