Started porting over schedule editor
Merged and edit schedule fixed again
more merge conflicts
Merge branch 'master' of https://github.com/kpan/sitterPlan