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

Conflicts:
	co2cloud/default/View/Indicators/index.ctp
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_cities
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_provinces
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_regions
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_subsidiaries
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_users
	co2cloud/default/tmp/cache/persistent/myapp_cake_core_cake_es-cl
	co2cloud/default/tmp/cache/persistent/myapp_cake_core_default_es-cl