forgotten password
forgotten password
Merge branch 'master' of git@github.com:ECML/ECML.git

Conflicts:
	ECML/res/values/strings.xml