bug fix
Merge branch 'master' of https://github.com/dawnbreaks/TcpProxy

Conflicts:
	README.md
	release/config/application.conf