NavBarAdd
cleaned
FinalChanges
NavBarAdd
cleaned
FinalChanges
updated for new verfion of develop
Merge remote-tracking branch 'origin/us40941' into us40941

Conflicts:
	index.js
	public/js/components/componentNavBar.js