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
Merge branch 'master' of https://github.com/worklist/hifi into master-old
Merge branch 'master' of https://github.com/worklist/hifi
Improved import system copying to clipboard
Fix for iris rendering; was broken by scale change.
Merge pull request #674 from ey6es/master

Fix for iris rendering.
fix the node ID unpack for avatar data
Merge pull request #675 from birarda/high-agent-IDs

fix the high node IDs in avatar mixer
Merge pull request #673 from Atlante45/better_import

Better import
make randIntInRange inclusive on the max side