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

Conflicts:
	assets/www/index.html