Merge branch 'master' of https://github.com/worklist/hifi
properly wrap XMPP stuff with "#ifdef HAVE_XMPP"
fixed packet sequence number rollover
maintenance: replace implicit casts with explicit
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.
use START_LOCATION as default settings
Force the scroll bar.
Scratch that; I just didn't understand how magic invisible disappearing scroll
bars worked on OS X.
fix copy-n-paste typo
gravity disabled by default
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