forgotten password
Merge branch 'forgottenpassword'

Conflicts:
	ECML/AndroidManifest.xml
	ECML/res/values/strings.xml
Merge branch 'master' of git@github.com:ECML/ECML.git
security question  and  forgotten password
security question and forgotten password finished
security question
Merge pull request #3 from ECML/security_question

Security question