s
Merge branch 'master' of https://github.com/Saronet/CTC_RU

Conflicts:
	www/js/managers/Navigation_Manager.js