Fixed schedule design
Merge remote-tracking branch 'origin/sixth_iteration' into ScheduleFix

Conflicts:
	res/layout/fragment_screen_home.xml