updated .gitignore
updated server-netty/README.md
Merge branch 'smiklosovic-master'