Historia de usuario ok, cancelar reserva funciona
Merge branch 'master' of https://github.com/mellerster/Remises-Seminario

Conflicts:
	remisesOnline/grails-app/controllers/remisesonline/ReservaController.groovy