Final prep
Merge branch 'master' of https://github.com/Earth4/server