Merge branch 'develop' into develop_aabb
Tested HMap class, started implementing CollisionModel system
Implemented draft 1 of the heightmap collision code
Performed first stage of moving to collision models: Moved AABBs to new system
Merged aabb