Updates to the Central Server
Merge branch 'master' of https://github.com/JimmyCollett/derp-octo-adventure