Mise à jour
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/ApiBedroomsController.php
	app/View/ApiContacts/index4.ctp
	app/View/PluginMedia/index_slider.ctp
	app/View/SiteLayoutBlocs/top_site.ctp
	app/View/SitePages/menu_favori.ctp
	app/View/SitePages/menu_responsive_menu.ctp
	app/View/SiteTemplatePages/nav.ctp
	app/View/Sites/view_footer_hotel.ctp
	app/View/Sites/view_header_logo.ctp