ignore warnings from OpenCV headers
resolve conflicts on merge with upstream master
prevents voxel data from being sent or received (read: requested) when voxel rendering is disabled
also adds a menu option under "Tools" to enable/disable the Oscilloscope
rename the stat type argument in Logstash
Merge pull request #610 from birarda/domain-stats

rename argument for Logstash stat stash
don't link a NOTFOUND leap library
Merge pull request #611 from birarda/leap-error

cmake fix for build error when leap library is missing
resolve conflicts on merge with upstream master
Merge pull request #586 from birarda/opencv-warnings

suppress warnings from OpenCV headers
flip the audio-mixer-frame-time-usage back to STAT_TYPE_TIMER
DS node count is a timer stat for now
Merge pull request #612 from birarda/domain-stats

flip mixer and domain server stat to timer to avoid logstash/graphite bug
fixed FOV preference to work with view frustum code properly
Fix for camera movement with webcam enabled; don't bother using roll from
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
(changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
Not crazy about the rotation amplification.
Merge pull request #613 from ZappoMan/bug_fixes

fixed FOV preference to work with view frustum code properly
Restore the amplification; blink faster.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #615 from ey6es/master

Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.