rearranged stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	shared/entity.lua
Merge branch 'master' of https://github.com/Domderon/spice-minions