Merge
Merge branch 'master' of 10.11.12.1:~/repos/crono

Conflicts:
	cronoappliance/crono/menu.pyc
	cronoappliance/crono/templates/crono/dashboards/top_ten.html
	cronoappliance/crono/views.pyc
	cronoappliance/cronoappliance/urls.pyc
Merge fixes