Add AI hierarchy with dummies
Merge remote-tracking branch 'origin/master' into ai-architecture
(Handles)

Conflicts:
	src/worldobject/ship.cpp
	src/worldobject/ship.h
Add missing includes
Switch Rocket to WorldObjectHandle as well
Add Scheduled-For-Deletion-Flag, remove protective loop
Make mark function protected and god a friend
Remove debug output
Spacing
Spacing
formatting
Merge pull request #253 from voxelinc/ai-architecture

Ai architecture
Merge pull request #254 from voxelinc/deletion-flag

Add Scheduled-For-Deletion-Flag
Merge remote-tracking branch 'origin/master' into nospecialphysics

Conflicts:
	src/worldobject/worldobject.cpp
	src/worldobject/worldobject.h