mod
Merge branch 'master' of github.com:AliyunUED/CloudEyes

Conflicts:
	.tmp/js/cloudeye/edit.js
	.tmp/js/edit.js