Merge branch 'master' of github.com:worklist/hifi
Merge branch 'master' of github.com:worklist/hifi
Made the stick and ball radius much smaller so they don’t break through the new meshes.
Merge remote-tracking branch 'origin/master'
Merge pull request #1158 from ZappoMan/bugfixes

fix to how voxel servers are queried when they have no known jurisdiction
Working on mesh fix.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1159 from ZappoMan/bugfixes

added more logging
Merge branch 'master' of https://github.com/worklist/hifi
Closer to mesh fix.
activate public socket if a node sends data to VS and AM
Merge pull request #1160 from ZappoMan/bugfixes

added menu item to enable extra debugging to help debug hq VS issue
Merge branch 'master' of github.com:worklist/hifi into assignment
Merge pull request #1161 from birarda/assignment

activate public socket for nodes who send data
add default and QtTraceMsg to switch to avoid warnings
Merge branch 'master' of github.com:worklist/hifi into assignment
Merge pull request #1162 from birarda/assignment

fix for some new warnings in qt 5.2
just use default to catch unknown Qt message types
Merge pull request #1163 from birarda/assignment

use default to catch unknown Qt message types
Smooth the normals.