remove netty dependency
Merge branch 'dev'