Merge origin/master

Conflicts:
	CG-PL001/src/OpenGL/AppListener.java
Merge origin/master