Web socket comments
Merge branch 'master' of github.com:osmman/JEE
Merge branch 'master' into jms