major ui changes
Merge branch 'master' of https://github.com/joeyjiron06/UCDMobileAPP

Conflicts:
	AndroidManifest.xml
	res/layout/day_view_activity.xml
	src/com/ucd/mobileapp/HomeScreen.java