fix some bugs in the navigation feature
Merge branch 'wwebsite' of https://github.com/aaronjosephs/BTV_project into wwebsite

Conflicts:
	features/support/paths.rb