4、控件属性的动态添加。
5、属性框的esc写成汉字，把保存换成下边一个，内置的编辑功能。over
6、模态框的关闭按钮保留。over
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/WebRoot/editor/lib/leftpoly.js
	OilManage/src/cn/edu/cup/gui/business/PointProper.java
	OilManage/src/cn/edu/cup/gui/dao/GUIDao.java
	OilManage/src/cn/edu/cup/manage/action/GUIProperAction.java
Merge remote-tracking branch 'origin/master'