fix bug
Merge branch 'master' of https://github.com/lutianming/3ddesigner

Conflicts:
	Designer/scene/templates/scene/2D.html