Updated to newest stuff
Updated objectmanager to use maps
Added and implemented basic collisions
Pulled from Sam's branch