Prestations
Merge branch 'master' of github.com:isylhdin/PED_MaisonHote

Conflicts:
	MaisonHote/src/main/resources/js/view/reservation.js
Merge branch 'master' of github.com:isylhdin/PED_MaisonHote

Conflicts:
	MaisonHote/src/main/resources/js/view/reservation.js