I thought I already did this...
Merge branch 'master' of https://github.com/Etskh/Jotun

Conflicts:
	.sconsign.dblite
	SConstruct
	src/systems/gfx/Gfx.h
	src/systems/gfx/Mesh.cpp
	src/systems/gfx/Mesh.h