Merge branch 'master' into shifting_particles

Conflicts:
	game/engines/default/engine/Actor.lua
	game/engines/default/engine/Entity.lua
	game/modules/tome/class/Actor.lua