First version of stable navigation
Merge branch 'master' of https://github.com/tksteph12/Atosengine-dev-team

Conflicts:
	RR/www/js/global.js