Server updates
Merge branch 'master' of https://github.com/acatejr/sophie