Schedule VIew
Merge branch 'refs/heads/Miguel-Branch'