Merge branch 'master' of
https://github.com/julien-marchand/BestPlace.git

Conflicts:
	src/main/java/gipad/configuration/configuration/Configurations.java
Merge branch 'master' of
https://github.com/julien-marchand/BestPlace.git