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

Bug 846079 - New Calendar Loader / Settings Fixes r=kgrandon(cherry picked from commit bcea26f1c5f816cc38f267200e2e8082a03e5117)

Conflicts:

	apps/calendar/js/controllers/alarm.js
	apps/calendar/test/unit/controllers/alarm_test.js
	apps/calendar/test/unit/dependency_loader_test.js
	apps/calendar/test/unit/views/week_test.js