s
Merge branch 'master' of https://github.com/rut-cambium/CTC_android

Conflicts:
	assets/www/js/managers/Feartur_Manager.js
j
Merge branch 'master' of https://github.com/rut-cambium/CTC_android