Added ProxyServer for Easy Start and Stop
Fixed server not being stopped
Merge remote-tracking branch 'origin/master'

Conflicts:
	netty-server/pom.xml
Added Guava for easy stream handling for test