"ka"
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	src/renderer/Renderer.cpp