permisos de usuarios
Merge branch 'master' of https://github.com/MdeCiudadInteligente/appropriation_is

Conflicts:
	View/Meetings/add.ctp