Merge pull request #8368 from lightsofapollo/calendar-new-loader

Bug 846079 - New Calendar Loader / Settings Fixes r=kgrandon
Conflicts:

	apps/calendar/js/app.js
	apps/calendar/js/controllers/alarm.js
	apps/calendar/js/views/modify_event.js
	apps/calendar/js/views/view_event.js
	apps/calendar/test/unit/app_test.js
	apps/calendar/test/unit/dependency_loader_test.js
	apps/calendar/test/unit/views/event_base_test.js
	apps/calendar/test/unit/views/modify_event_test.js
	apps/calendar/test/unit/views/view_event_test.js
	apps/calendar/test/unit/views/week_test.js
Merge pull request #9426 from evanxd/bug-855814

Bug 855814 - Calendar: Notification: Tapping doesn't always launch app and show event.
Merge pull request #9577 from lightsofapollo/notification-wake-lock

Bug 867652 - Hold CPU locks until notification is dispatched.
Conflicts:

	apps/calendar/js/controllers/alarm.js
	apps/calendar/test/unit/controllers/alarm_test.js
Merge pull request #9500 from lightsofapollo/calendar-oauth

Bug 867747 - Calendar oauth
Conflicts:

	apps/calendar/index.html
	apps/calendar/js/ext/caldav.js
	apps/calendar/js/load_config.js
	apps/calendar/js/presets.js
	apps/calendar/js/store/account.js
	apps/calendar/js/views/modify_account.js
	apps/calendar/test/unit/views/modify_account_test.js
Merge pull request #9650 from KevinGrandon/bug_868197_account_delete_flow

Bug 868197 - Oauth account delete flow r=lightsofapollo
Merge pull request #9692 from gaye/bug-870134

Bug 870134 - Redirect back to the account select view when we get access_denied
Merge pull request #9652 from lightsofapollo/improve-error-handling

Bug 867748 - Error recovery from account settings (mostly for oauth2)
Conflicts:

	apps/calendar/index.html
	apps/calendar/js/controllers/sync.js
	apps/calendar/js/provider/caldav.js
	apps/calendar/js/service/caldav.js
	apps/calendar/js/store/account.js
	apps/calendar/js/store/calendar.js
	apps/calendar/js/views/advanced_settings.js
	apps/calendar/js/views/modify_account.js
	apps/calendar/js/views/modify_event.js
	apps/calendar/js/views/settings.js
	apps/calendar/style/modify_account_view.css
	apps/calendar/style/ui.css
	apps/calendar/test/unit/controllers/sync_test.js
	apps/calendar/test/unit/provider/caldav_test.js
	apps/calendar/test/unit/store/account_test.js
	apps/calendar/test/unit/view_test.js
	apps/calendar/test/unit/views/advanced_settings_test.js
	apps/calendar/test/unit/views/modify_event_test.js
	apps/calendar/test/unit/views/settings_test.js
Merge pull request #9693 from lightsofapollo/notify-on-sync-error

Bug 870664 - Send notification when account fails to sync r=kgrandon (tests/lint pass locally)
Conflicts:

	apps/calendar/js/store/account.js
	apps/calendar/locales/calendar.en-US.properties
	apps/calendar/test/unit/controllers/alarm_test.js