work in progress
fixed (?) a wrong handling of network error
Merge branch 'master' into authentication

Conflicts:
	src/connectionBase.hpp