Updates for signal server 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/zipwhip/api/signals/SocketIoSignalConnection.java
Add unit test