Fixes to camera and physics
Merges and merges
Collisions with edges ready for testing
Collisions with edges ready for testing
Merge branch 'Logic' into water
borders now follow water level/camera