Messenger Service
Merge branch 'master' of https://github.com/ECML/ECML.git

Conflicts:
	ECML/AndroidManifest.xml
	ECML/res/values/colors.xml
	ECML/res/values/strings.xml