Move settings.php back to its correct place so that the cron jobs work again
Merge branch 'master' of github.com:MineForeman/MinePeonWebUI