Create the forgot_password and reset_password_after_recovery view
Merge branch 'master' of https://github.com/omg-insa/client

Conflicts:
	PlanYourParty/res/values/strings.xml
	PlanYourParty/src/fr/insalyon/pyp/gui/login/ForgotPasswordActivity.java