Merge remote-tracking branch 'origin/issue87' into cloud-dashing-86
fix bug
fix #86
cloud-dashing-86 统计页改造
fix #86
cloud-dashing-86 统计页改造
fix #86
cloud-dashing-86 统计页改造
Merge branch 'issue87' into issue86

Conflicts:
	cloud_dashing/static/js/views/control-panel.js
Merge branch 'issue86'