merge conflict generator (clean up naming of handler/manager in server/)

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Cargo.lock
#	client/src/lib.rs
#	server/src/client_handler.rs
#	server/src/handler.rs
#	server/src/main.rs

cleanup

hell is over?

hell pt2

hell