mitosis of settings page into settings and scheduler conflicts pages
Merge branch 'master' of https://github.com/vickygx/theFrozzies