Working on object attributes.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Working on editing QObjects.
Fix box color on hovering.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Layout fix.
add easier support for key codes in JS by adding text property and auto-detecting isShifted
implement a basic exampple of ride along with a particle
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
make sure to flush edit queue on script shutdown
Moving MyAvatar specific code out of Avatar and into MyAvatar.
MyAvatar doesn't need to be a friend of its base class Avatar.
Removing AvatarManager::clear() as unecessary during class destruction.
Working on parameterizable URLs, etc.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Working on a test guide.
Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar.
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work

Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticlesScriptingInterface.cpp
fix for ttf return in DS, closes #1769