fixed mis-drop error on canvas palette
fixed droppable sort of
Merge branch 'kpam-iter3'

Conflicts:
	assets/javascript/canvas-engine.js
	stage/editor.html