View the places in ordre to add a new event
Merge branch 'master' of https://github.com/omg-insa/client

Conflicts:
	PlanYourParty/res/values-en/strings.xml
	PlanYourParty/res/values-fr/strings.xml

Resolve conflict strings.xml