Rendering
Merge branch 'master' of github.com:skogler/boom
Merge branch 'master' of github.com:skogler/boom

Conflicts:
	src/client/Renderer.cpp
Merge branch 'master' of github.com:skogler/boom