Cubemap now loaded via VFS
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/RenderingPipeline.py