- Added code to the addClient method to set a reference to the
conversation
- Removed code from the afterConnectionEstablished method that had a
chatClient setting a conversation reference
Merge branch 'master' into createImplementationOfServiceAPI_ACE-27

Conflicts:
	org.ualerts.chat.web/src/main/java/org/ualerts/chat/web/sockjs/SockJsHandler.java