Merge remote-tracking branch 'origin/development' into Edwin

Conflicts:
	C++/GraphicsManager.cpp