Update netty to 3.6.1, fixes leaking thread pools
Merge pull request #140 from gmanika/updatenetty

Update netty to 3.6.1, fixes leaking thread pools
Merge branch 'master' into production