moved constructor
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	libraries/avatars/src/AvatarData.cpp
	libraries/avatars/src/AvatarData.h
merge
merge
merge
Merge pull request #358 from ZappoMan/master

Move constructor as per Stephen's request
resolve conflicts on merge with upstream master