Merge branch 'master' of https://github.com/worklist/hifi into debone
Merge branch 'master' of https://github.com/worklist/hifi into debone
Skeleton removal checkpoint; compiles, but there are a few bits missing.
removed redundant embedded ifdefs
fix sign warning
Merge pull request #1547 from ZappoMan/windows_build

removed unneeded redundant #ifdefs and fixed compiler warning
fix moveToThread for AssignmentClient NodeList, fixes #1551
Replaced missing functionality.
fixes leak of GenericThread and also fixes crash in octree servers on client disconnect
removed dead code
Merge pull request #1552 from birarda/master

fix for NodeList moveToThread
Merge branch 'master' of git://github.com/worklist/hifi into generic_thread_fix
fix voxel randomly disappearing bug
fixed comment
Merge branch 'master' of https://github.com/worklist/hifi into debone

Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
Merge branch 'master' of https://github.com/highfidelity/hifi into debone
fixed comment that erroneously said wait when it should have said quit
Merge pull request #1553 from ZappoMan/generic_thread_fix

fixes leak of GenericThread and also fixes crash in octree servers on client disconnect
Merge branch 'master' of https://github.com/highfidelity/hifi into debone
Merge pull request #1554 from ZappoMan/bugfixes

Fix the issue with voxels randomly disappearing in the client