added sleep to sendVoxelOperation() to keep from overwhelming server
fixed server persistance issue
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
added Import Voxels to Clipboard
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
CR feedback
white space
Merge pull request #682 from ZappoMan/bug_fixes

Import Voxels and Paste Bug fixes
added scale to settings
Merge branch 'master' of http://github.com/worklist/hifi into scale_in_settings
switch calls to printLog to QDebug
remove now extraneous newlines after switch to QDebug
Merge pull request #684 from Atlante45/scale_in_settings

Scale in settings
add a message handler to send messages over to LogDisplay
correctly break on end of qDebug message in LogDisplay
Changed shortcuts to ALT+ +/-
Adapt avatar message size to the avatars
Merge branch 'master' of http://github.com/worklist/hifi into few_avatar_resizing_correction
Calling glInterleavedArrays enables the client vertex/color array states, so
we need to disable them afterwards.
Merge pull request #687 from ey6es/master

Fix for sexy eyeshadow when voxels were turned off.