merging
update glow
Merge branch 'master' of https://github.com/voxelinc/voxellancer into HEAD

Conflicts:
	src/ai/character.cpp
	src/ai/character.h
	src/scenarios/gamescenario.cpp
	src/ui/hud/objecthudgetcornervoxels.cpp