zwischenstand
Merge branch 'master' of https://github.com/smichan/Praktikum

Conflicts:
	Framework_OpenGL/cone.cpp
	Framework_OpenGL/cylinder.cpp
	Framework_OpenGL/sphere.cpp
	Framework_OpenGL/torus.cpp