Deletion works, made the GameObject-Drawable-Highlight trinity generic
Merge branch 'master' of https://github.com/SnowblindFatal/tim

Conflicts:
	src/game/GameObject.cpp
	src/game/GameObject.h