PropertiesController
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/administrador/controllers/PropiedadesController.php