Added 'jumper' enemy
Merge remote-tracking branch 'origin/develop' into develop
Populate world as it is generated
Add command icons
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	views/ld26.coffee
	views/tank.coffee