Manage several errors
Merge branch 'master' of https://github.com/omg-insa/client

Conflicts:
	PlanYourParty/res/values/strings.xml

Resolve conflict strings.xml