no message
Merge branch 'develop' of https://github.com/susemi99/TestThales into hotfix/v1.1

Conflicts:
	res/layout/activity_main.xml