Fixed the server after disastrous git merge
Merge branch 'master' into sophie