Login 2nd version
Merge branch 'master' of https://github.com/ECML/ECML.git

Conflicts:
	ECML/src/com/ecml/ECMLActivity.java