Merge pull request #1 from wso2-dev/master

Merge wso2-dev/master to wso2:master
Merge pull request #2 from wso2-dev/master

Moving fixes by KasunG
upgrading tomcat version to 7.0.52.wso2v3 which has websocket changes
Merge pull request #11 from kasunbg/master

upgraded tomcat version