fix #67
fix #67
Merge branch 'master' into issue67
Merge branch 'master' of https://github.com/PuZheng/cloud-dashing

Conflicts:
	cloud_dashing/static/templates/control-panel.hbs