Fixed errors, and upgraded tomcat to support websocket
Merge remote-tracking branch 'origin/master'