Merge branch 'master' of https://github.com/worklist/hifi
Add reflect(direction, normal) to Vec3 scripting calls
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Fix drumstick script
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
coding standard cleanup, fix warning
fix warnings in overlays
added support for rolling version numbers in backups
Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements
Merge branch 'master' of https://github.com/worklist/hifi
JS signal when AM mutes client
Merge branch 'master' of https://github.com/highfidelity/hifi into mute_signal
Give noisy mutes their own packet type
Remove lastMuted member in AvatarAudioStream
Remove forgotten setLastMuted
Merge pull request #3807 from ZappoMan/flightTimeDebugging

Flight time debugging
revert debugging change
Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements

Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h