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
Bunch of improvements to combat
Merge remote-tracking branch 'remotes/origin/Ash' into steven

* remotes/origin/Ash:
  Framework for Level Loading
  Updated Level References / Added a Level Convertor

Conflicts:
	C#/Game.cs
Level loading now working
Merge branch 'steven' into development
Attached level to game and cleaned up rendering
Merge branch 'steven' into development
Minor adjustments
Merge branch 'development' into steven
Cleaned up combatant collisions a little
Firing handled by mouse as well
You can now sprint
cleanup
Cleanup
Merge branch 'steven' into development
Even More Cleanup
Merge branch 'steven' into development