changes from mac11
Merge branch 'develop' of https://github.com/susemi99/TestThales into develop

Conflicts:
	res/layout/activity_main.xml