Fixed invalid build
Merge branch 'master' of https://github.com/LauriM/ProjectIce

Conflicts:
	src/engine/render/RenderSystem.cpp