engine change and stuff
Merge branch 'master' of github.com:LanJian/tempest

Conflicts:
	src/panels/loadoutPanel.coffee