Merge branch 'develop' into graphics

Shader still WIP; Hardcoded pixel RGBs for now so no waterlevel coloring

Conflicts:
	Systems/RenderSystem.cpp
	Systems/RenderSystem.h
	worldsim.cpp