Almost ready, url for current_schedule needs work
url for schedule fixed
Merge remote-tracking branch 'refs/remotes/origin/master' into calendar-refactor