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
Updated Level References / Added a Level Convertor

Updated references to the 'Level' to be 'World' not 'Graphics' /
Implemented a Level Creator which converts JSON vertex data into a
format which will eventually be readable by the engine.
Merge remote-tracking branch 'origin/development' into Ash
Bunch of cleanup for the combat
Framework for Level Loading
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