indicadores
Merge branch 'master' of https://github.com/hyoume/aesir

Conflicts:
	co2cloud/admin/tmp/cache/persistent/app_cake_core_file_map
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_emissions
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_source_types
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_sources
	co2cloud/default/tmp/logs/error.log