fix reporting
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Hotel/reserveBundle/Controller/AdminReportingController.php
	src/Hotel/reserveBundle/Controller/AdminRoomController.php