Editor works.
Merge branch 'dev' of https://github.com/Ezphares/sw705e13 into dev

Conflicts:
	cells/static/js/game.class.js