Added magic manager and misc improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	lua/entities/fom_base_fireball/shared.lua