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
Trivial change - testing deploy changes
Merge branch 'master' of https://github.com/worklist/hifi
fix for avatar scale bug, closes #1506
Persist the user orientation as well as the position, show up a couple meters
in front of (and facing) target.  Closes #1367.
allow fade scale to get smaller than minimum avatar scale
Merge pull request #1509 from birarda/master

fix for avatar fade/scale bug
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1510 from ey6es/master

When teleporting to a user, face them from a couple meters away.
Merge branch 'master' of git://github.com/worklist/hifi into windows_build

Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h