check for crucial voxel
add icon to exe
add world status on f9
fix
fix particle context rebuild
Add window icon to glfw window
Merge pull request #524 from voxelinc/icon

add icon to exe
Merge pull request #528 from voxelinc/fix_particleengine_context_rebuild

fix particleengine context rebuild
Merge branch 'master' of github.com:voxelinc/voxellancer into world_status

Conflicts:
	src/voxeleffect/voxelparticleengine.cpp
Merge pull request #527 from voxelinc/world_status

add world status on f9
Merge branch 'master' of github.com:voxelinc/voxellancer into check_for_crucial_voxel
Rename RUB to URB (seems to be standard)
Update worldobjectbuilder.cpp
Merge pull request #532 from voxelinc/mv_rub_urb

Rename RUB to URB (seems to be standard)
Merge pull request #531 from voxelinc/check_for_crucial_voxel

check for crucial voxel
Merge branch 'master' of github.com:voxelinc/voxellancer into final_presentation

Conflicts:
	doc/howto.md
	src/voxeleffect/voxelparticleengine.cpp
	src/world/world.cpp