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

Conflicts:
	co2cloud/default/tmp/cache/models/myapp_cake_model_default_co2cloud_app_default_subsidiaries