Merge branch 'develop' into graphics

Conflicts:
	Systems/RenderSystem.cpp
	Systems/RenderSystem.h
	worldsim.cpp
Use version 120 shaders for OpenGL 3.0