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
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
Merge branch 'master' of https://github.com/worklist/hifi
No more .f
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f

Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
remove voxel edit
Merge branch 'master' of https://github.com/worklist/hifi
Update tools to snap to grid on creation
trim whitespace for place name lookup
remove texture replace fix to avoid a crash