New server controller
Merge remote-tracking branch 'pulseworxapp/master'
Minor stuff, I hope.