增加block测试发送日志和点击打点
Merge branch 'master' of https://github.com/AliyunUED/CloudEyes

Conflicts:
	.tmp/js/cloudeye/edit-iframe.js
	.tmp/js/cloudeye/edit.js
	.tmp/js/modules/edit/edit-iframe.js
	.tmp/js/modules/edit/ui/action/rearrange.js