init - tomcat 8 websocket with annotation configuration.
Merge remote-tracking branch 'origin/master'