Replaced configuration with non-static struct
Merged upstream server
Merge branch 'master' of github.com:JohnUiterwyk/robocakes
Merge branch 'master' of github.com:JohnUiterwyk/robocakes