图形，点击，出现菜单，delete功能
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/.settings/org.eclipse.core.resources.prefs
	OilManage/WebRoot/editor/editor.jsp
	OilManage/WebRoot/editor/lib/init.js