use AgentList defaults when AIM has no socket or address set
Merge branch 'master' of github.com:worklist/hifi
moved constructor
move constructor for AvatarData to implemenation file
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
Merge pull request #355 from birarda/master

have the AudioInjectionManager use sensible defaults when nothing is set
re-arrange member variable constructors for compiler warning
Merge pull request #359 from birarda/master

rearrange member variables in Oscilloscope constructor
fix
Merge remote-tracking branch 'upstream/master'
fix