Updates to scheduler models and admin forms.
Merge branch 'master' of https://github.com/bethlakshmi/GBE2