removing boxes in editor
delete support
Merge branch 'master' of https://github.com/QAston/hackathon

Conflicts:
	boxes.js
Merge branch 'master' of https://github.com/QAston/hackathon