View de actividades profile
View de sources profile
Merge branch 'master' of https://github.com/hyoume/aesir

Conflicts:
	co2cloud/app/View/Activities/view.ctp
modificar emission
Merge branch 'master' of https://github.com/hyoume/aesir