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

Conflicts:
	assets/www/index.html
	assets/www/js/managers/Timer_Manager.js