Merge branch 'shihoon' into ernest

Conflicts:
	lib/game/levels/prototype.js
Delete stuff