objecthantering + borttagning throw
fix merge fail
Merge branch 'master' of https://github.com/gustav9797/sampserver

Conflicts:
	src/sampserver/ObjectHandler.cpp