try snapping with context menu
Merge branch 'master' of https://github.com/x3dom/apps-modeling

Conflicts:
	editor/static/js/UI.js