cambios a recintos controller compra de hoteles
Merge branch 'master' of https://github.com/oscarvegar/yoplanner

Conflicts:
	.brackets.json
	api/controllers/RecintoController.js