merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times.
made Leap unit-conversion method public
updated per feedback
Merge pull request #669 from machinelevel/dev4

Added fake Leap finger generation so that Ryan and Jeffrey can work on L...
Build fail fix when Leap libs are not present.
Merge branch 'master' of https://github.com/worklist/hifi into master-old
Merge pull request #671 from machinelevel/dev4

Build fail fix when Leap libs are not present.
Merge branch 'master' of https://github.com/worklist/hifi
Improved import system copying to clipboard
Fix for iris rendering; was broken by scale change.