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
Added drumSticks example script
better comments in script
put data-server hostname back to data.highfidelity.io
hook the user's avatar object into the Interface ScriptEngine
fix a couple of warnings by using QString for object name
remove unused hiredis externals, closes #1612
Merge pull request #1614 from birarda/scripted-avatar

expose MyAvatar to Interface ScriptEngine
add debugging for mesh and skeleton changes for other Avatars
Merge pull request #1619 from birarda/master

add debugging for mesh and skeleton changes for other avatars
Merge pull request #1617 from birarda/redis-warnings

remove unused hiredis externals
Merge pull request #1610 from PhilipRosedale/master

Example script drumSticks.js lets you play air drums
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Conflicts:
	interface/src/Application.cpp