- arreglos de per night por per person
Merge branch 'master' of https://github.com/pablotandil/joinajoin

Conflicts:
	views/properties/view.ctp

merge de mierda