Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html

Update "thank you" text in help modal

As per request from Mary.

Jobs page updates.

Upgrade to Backbone 1.0.0

Redirect authenticated users from registration or login to dashboard

Set SERVER_EMAIL so that mail_admins works

Remove marketing URLs from common.py

Disable SSL cert validation for Zendesk API

studio - alerts: synced up styles and sample markup

They are currently using a CA that is not installed on our servers. Since it
isn't a top-tier CA and we aren't submitting anything particularly sensitive
anyway, we don't have to feel too bad about this.

studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins

Pass through the value (either default or inherited) that a metadata field WILL have if it is not explicitly set.

The MKTG_URLS dictionary is overwritten completely in aws.py anyway, and we
shouldn't be trying to keep both the production config and LMS code in sync
with changes to the marketing site.

Hide the Comments Service API key during logging.

Backbone 1.0.0, Underscore 1.4.4

Added unit tests for safe_key() to resolve bug 392.

Fix links to honor code, ToS, and privacy policy for marketing site

Vik/fix/oe bugs

Fix registration button text

Fix courses link in LMS header when not logged in

Delete two lines.  without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data)

Feature/giulio/accessibility

be more forgiving about the iframe url

If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.