add icon to exe
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