Acl, links y paginas de error
Merge branch 'master' of https://github.com/hyoume/aesir

Conflicts:
	co2cloud/default/Controller/AppController.php
	co2cloud/default/View/Groups/add.ctp
	co2cloud/default/View/Groups/edit.ctp