Merge pull request #9500 from lightsofapollo/calendar-oauth

Bug 867747 - Calendar oauth
Conflicts:

	apps/calendar/js/ext/caldav.js
	apps/calendar/js/presets.js
	apps/calendar/js/views/modify_account.js