extend spoon.js editor branch
Merge branch 'editor'

Conflicts:
	assets/js/spoon.js