revert schedule to json-based one
port all schedule changes
Merge branch 'master' into dev/i18n/merge