Added a lot of updates to the calendar.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/menu/trip.xml
Utility got deleted somehow. readded it.