Fo, shaw!
Merge branch 'master' of github.com:growse/CRUKGameJamTeamAwesome

Conflicts:
	frontend/assets/js/src/world/WorldController.js
Merge branch 'master' of github.com:growse/CRUKGameJamTeamAwesome