Personal info (work in progress)
Merge branch 'master' of https://github.com/omg-insa/client into develop

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