Merge branch 'master' into Rianne
Started with schedule screen
Merge branch 'Rianne'