Fixed problems with My Schedule.
Other minor fixes.
Fixed problems with My Schedule.
Other minor fixes.
Merge remote-tracking branch 'origin/master'
Fixed conflict.