commit pour merge
Merge branch 'master' of https://github.com/Basemasta/campark

Conflicts:
	campark-web/src/main/java/fr/miage/orleans/campark/controller/SmartphonesRestController.java