xml file
Merge branch 'master' of https://github.com/ECML/ECML.git

Conflicts:
	ECML/android-im_WEBAPI/index.php