Upgrade dependencies

Netty 4.0.23.Final
Spring Framework version (4.1.1)
Fix whitespace and indentation