Calendar Update

Minor update to display things. Different branch from errors
Merge branch 'calendar-update'

Conflicts:
	GrantMobile/src/com/example/grantmobile/CalendarSquare.java
	GrantMobile/src/com/example/grantmobile/CalendarView.java