fix imagenes slider
Merge branch 'master' of https://github.com/diegopuglia/cdm

Conflicts:
	admin/application/controllers/HotelController.php
	admin/application/views/scripts/hotel/edit.phtml