fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/WebRoot/editor/lib/leftpoly.js
更新了锁定后，再经过旋转后控件的定位问题
Merge remote-tracking branch 'origin/master'