Merge branch 'ProjetPACT/master'

Conflicts:
	src/Jeu/Manitou.java
	src/moduleOPENGL/GLBaseModule.java
	src/moduleOPENGL/LightingSphere.java
	src/moduleOPENGL/TextureCube.java (reverted from commit aae108495b0069d5cd3a497a5e26807a5bcd0e36)