More bugfixes for the server.
Merge branch 'master' of github.com:infoforcefeed/Project-Oleg