Merge branch 'master' of https://github.com/highfidelity/hifi
Hitting enter no longer shows chat window when chat is disabled.

When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
Merge branch 'master' of https://github.com/highfidelity/hifi
add a pretty important missing line for symmetric socket activation
Merge pull request #2579 from brotchie/master

Hitting enter no longer shows chat window when chat is disabled
Merge pull request #2580 from birarda/master

add a missing line for symmetric socket activation