Updated with final memory changes
Merge branch 'master' of https://github.com/bmcgraw19/Box2