navigation fix
Merge branch 'master' of github.com:RomanBrodetski/gsc

Conflicts:
	app/assets/javascripts/navigation.js