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

Conflicts:
	View/Meetings/add.ctp
Merge branch 'dev'

Conflicts:
	Controller/SitesController.php
probando rama testing
Revert "probando rama testing"

This reverts commit ed365b6d4cb7734364c96e6b150bfc6bebc8b8ac.
Merge branch 'dev' into testing
Merge branch 'dev' into testing
Merge branch 'dev' into testing
Merge branch 'dev' into testing

Conflicts:
	View/Divulgations/add.ctp
Merge branch 'dev' into testing
Merge dev