Merge branch 'master' of github.com:worklist/hifi
adding support for better multithreading in VoxelTree
Add MyAvatar subclass. For functions such as render() and simulate(),
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
Add MyAvatar and resolve merge conflicts.
Remove unused setNoise() function in MyAvatar.h that was causing
build error.
Remove unnecessary comments and spaces.
Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server

Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
threads for persist and packet processing
removed old dead code
dead code cleanup
flush delete queue after encode is complete
Style and spacing changes in MyAvatar/Avatar classes.
Magic number removal...
Fixed only square png import + reduced amount of code
fix comment
fix comment
Fixed magic number
fix comment
Merge pull request #878 from LionTurtle/master

Add MyAvatar class, subclass of Avatar class.