Merge branch 'develop'

More encryption methods.

Better multi-server support for client, more error log for server.

Use leaky buffer.

Should be stable and feature rich.