navbar changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestAppEngineProject/war/viewspots.jsp
persistent navbar with highlighted links reflecting the current opened
page