Added memory tracking
Merge branch 'dev' into dev_AO
Fixed Box2D link error, deleted some stuff from SpaceManImp