add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
Merge pull request #1216 from ZappoMan/vs_shutdown_behavior

add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
Merge pull request #1224 from birarda/master

use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes