Merge branch 'master' of https://github.com/voxelinc/voxellancer into improve_split_performance

Conflicts:
	src/voxeleffect/voxelexplosiongenerator.cpp