Log levels in server
Merge branch 'master' of https://github.com/benring/final