Transparency / Textures /
Merge remote-tracking branch 'origin/opengl3_2' into opengl3_2

Conflicts:
	src/streetmap/Game.java