package transport.socket redesigned
Merge branch 'master' into jdk1.6

Conflicts:
	src/main/java/ch/softappeal/yass/transport/socket/PathResolver.java
	src/main/java/ch/softappeal/yass/transport/socket/SocketListener.java
	src/main/java/ch/softappeal/yass/transport/socket/SslSetup.java
	src/main/java/ch/softappeal/yass/transport/ws/WsConnection.java
	src/main/java/ch/softappeal/yass/transport/ws/WsEndpoint.java
	src/main/js/yass.js
	src/test/java/ch/softappeal/yass/transport/socket/StatelessTransport.java
	src/test/java/ch/softappeal/yass/transport/socket/test/SocketTransportTest.java
	src/test/java/ch/softappeal/yass/transport/ws/test/UndertowTransportTest.java
	src/test/java/ch/softappeal/yass/transport/ws/test/WsTest.java
	src/tutorial/java/ch/softappeal/yass/tutorial/client/JettyClient.java
	src/tutorial/java/ch/softappeal/yass/tutorial/server/JettyServer.java
fixed merge conflicts