Fix line endings
Update Maven dependencies

This updates Spring, Logging and Netty-socketio. The new Netty-socketio
version fixes memory leaks and disables SSL3 encryption (POODLE
vulnerability).
Release version 2.0.2
Merge branch '2.0'

Conflicts:
	pom.xml