use AgentList defaults when AIM has no socket or address set
Merge branch 'master' of github.com:worklist/hifi
move constructor for AvatarData to implemenation file
resolve conflicts on merge with upstream master
Merge pull request #355 from birarda/master

have the AudioInjectionManager use sensible defaults when nothing is set