Drag and draw
Merge branch 'DragAndDraw' into develop0.1

Conflicts:
	js/view/ToolbarView.js