saving the file
Merge branch 'master' of https://github.com/omg-insa/client into develop

Conflicts:
	PlanYourParty/src/fr/insalyon/pyp/tools/Constants.java