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

Conflicts:
	res/layout/activity_main.xml
test
Merge branch 'develop' of https://github.com/susemi99/TestThales into develop
ttt
Merge branch 'develop' of https://github.com/susemi99/TestThales into develop
v1
Merge branch 'release/v1.0'