Minor Movement Changes
Merge branch 'steven' into development

* steven:
  Minor Movement Changes
Merge remote-tracking branch 'origin/development' into Edwin

Conflicts:
	C++/GraphicsManager.cpp