Merge branch 'steven' into development
Merge branch 'development' into Edwin

* development:
  Merge back of edwins code
  First steps towards ui support
  Minor adjustments and cleanup
  Can not longer jump up and through, also cleaned up clipping further
  Fixed some garbage collection issues, and added a little something something
  Fog
  Clipping fix
adding killable enemies
Merge remote-tracking branch 'remotes/origin/Edwin' into steven

* remotes/origin/Edwin:
  adding killable enemies

Conflicts:
	C#/Game.cs
Bunch of cleanup for the combat