- 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
Added expectations for the ChatClient.setConversation method call to
each test in ConcreteConversationTest
Merge pull request #9 from ualerts-org/createImplementationOfServiceAPI_ACE-27

Added expectations for the ChatClient.setConversation method call to
Merge remote-tracking branch 'origin/master' into ACE-23