ForgotPassword request OK and link to ResetPassword
Merge branch 'master' of https://github.com/omg-insa/client

Conflicts:
	PlanYourParty/AndroidManifest.xml
	PlanYourParty/res/values-fr/strings.xml
	PlanYourParty/src/fr/insalyon/pyp/gui/common/popup/Popups.java
	PlanYourParty/src/fr/insalyon/pyp/network/ServerConnection.java
	PlanYourParty/src/fr/insalyon/pyp/tools/Constants.java

Resolve several conflicts