Removed more deprecated stuff from the shaders
Made some improvements
Merge branch 'master' of https://github.com/MPursche/3dcgtutorials

Conflicts:
	02_OsgInstancing/src/InstancedDrawable.cpp
Merge branch 'master' of https://github.com/MPursche/3dcgtutorials
Fixed issue in shader that prevented it from running on ATI cards