Fixes migrations for new models
Fixes migrations for new models
Merge branch 'recurring-events' into deploy
Merge branch 'features/irc' into deploy

Conflicts:
	cabot/cabotapp/migrations/0004_auto__add_field_service_irc_alert.py
	cabot/cabotapp/migrations/0008_auto__add_field_shift_last_modified.py
	cabot/cabotapp/migrations/0009_auto__add_field_instance_irc_alert__add_field_userprofile_irc_nick__ad.py