Merge branch 'master' of https://github.com/worklist/hifi
fixed packet sequence number rollover
Don't use the scale to determine the depth in Faceplus.  Apparently it's not
reliable.
Update attachment data on attachment delete.
Better attachment styling.
Force the scroll bar.
Scratch that; I just didn't understand how magic invisible disappearing scroll
bars worked on OS X.
Fix for attachments' not appearing in rear view mirror head mode.
Un-default the "OK" button so that we can press enter on the URL field.
Attachment translations in world space.
Only add each texture once.
Fixed orientation and offset issues
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge pull request #2798 from Atlante45/master

EditModels.js
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
Merge pull request #2797 from ey6es/master

Disabled depth determination based on scale for Faceplus, improved attachment edit UI, fix for attachments' not appearing in rear view mirror head mode.
Merge branch 'master' of https://github.com/worklist/hifi
Fix for exports from Sketchup.
make model server not oversend data
Merge pull request #2802 from ey6es/master

Fix for exports from Sketchup.