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

Conflicts:
	cronoappliance/cronoappliance/urls.py
	cronoappliance/cronoappliance/urls.pyc
Merge fix