Canch
Merge branch 'master' of https://github.com/gaccardo/crono

Conflicts:
	cronoappliance/crono/templates/crono/dashboards/sites_info.html
Merge fix
Merge branch 'master' of https://github.com/gaccardo/crono
Resoursec
Merge branch 'master' of https://github.com/gaccardo/crono

Conflicts:
	cronoappliance/crono/__init__.pyc
	cronoappliance/crono/admin.pyc
	cronoappliance/crono/menu.pyc
	cronoappliance/crono/models.pyc
	cronoappliance/crono/views.pyc
	cronoappliance/cronoappliance/__init__.pyc
	cronoappliance/cronoappliance/settings.pyc
	cronoappliance/cronoappliance/urls.pyc
	cronoappliance/cronoappliance/wsgi.pyc