Merge branch 'steven' into development

* steven:
  Now Drawing World Voxels
  Extended inheritance tree for game objects.
  made base gameobject class abstract
  Input handling logic, first implementation.
  vector and weapon updates
Merge branch 'steven' into development
Merge branch 'steven' into development
Merge branch 'steven' into development
Merge branch 'steven' into development
Merge branch 'steven' into development
Merge branch 'steven' into development
Merge branch 'steven' into development
code cleanup and better commenting
cleanup of color class
Merge branch 'steven' into development

* steven:
  Minor Movement Changes
hacked in a 'skyblue' skybox/glclear color
Merge remote-tracking branch 'origin/development' into Edwin

Conflicts:
	C++/GraphicsManager.cpp
Merge remote-tracking branch 'origin/development' into Edwin

Conflicts:
	C++/GraphicsManager.cpp
made glclear sky blue
projectile in progress work
Minor Lighting work
Merge remote-tracking branch 'remotes/origin/Edwin' into development

* remotes/origin/Edwin:
  projectile in progress work
  made glclear sky blue
  Merge remote-tracking branch 'origin/development' into Edwin
  hacked in a 'skyblue' skybox/glclear color
  cleanup of color class
  code cleanup and better commenting
Merge branch 'development' into steven

* development:
  Minor Lighting work
  projectile in progress work
  made glclear sky blue
  Merge remote-tracking branch 'origin/development' into Edwin
  hacked in a 'skyblue' skybox/glclear color
  cleanup of color class
  code cleanup and better commenting