Merge pull request #7912 from lightsofapollo/calendar-server-color

Bug 836780 - Use a default color when server does not send one.
Conflicts:

	apps/calendar/test/unit/views/week_test.js