Completes server and client communication, preparing for session management
Fixes tamasgal/royweb/issues/#6
Merge branch 'master' into sessions