Update lights and fx of scenes.
Merge branch 'master' of https://github.com/cchampet/OpenGL

Conflicts:
	DiveInSpace/src/main.cpp