Merge branch 'qt5'
Merge branch 'master' of github.com:worklist/hifi
some necessary changes for AvatarData transmission
Merge pull request #740 from birarda/master

necessary changes for AvatarData