merging
Merge branch 'master' of https://github.com/thomasaj91/ColdCalendars

Conflicts:
	ColdCalendars/lib/Shift.php