Merge remote-tracking branch 'upstream/master' into shadows
works
wip
wip
wip
Very initial shadows support (now for objects)
Merge remote-tracking branch 'upstream/master' into shadows

Conflicts:
	src/sky.cpp
	src/sky.h
Merge remote-tracking branch 'origin/shadows' into octree