make edit link use static_asset_path in xmodule_modifiers.py
Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path

Conflicts:
	common/djangoapps/xmodule_modifiers.py
lms namespace removed
module -> block in common/djangoapps/xmodule_modifiers.py
Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path
LMS: add CSRF token to register form
Add Neurolit to AUTHORS file
Refactor out certificate logic from the course listing.

LMS-1477
Add a new status for verified certificates.

LMS-1477
LMS: revises certificate download copy
Set empty aws credentials to None.
Changed create_enrollment to create_or_update_enrollment
all CourseEnrollment modifications route through create_or_update
purchased_callback now uses the change_mode method
make edxapp work when not run from a git repo
actually, just remove the revision
Add in a new hook for people who are embargoed in the verified cert track.

LMS-1477
BLD-489: Fix JavaScript tests.
Merge pull request #1623 from edx/valera/fix_js_error_transcripts_editor_spec

Fix JavaScript typo in transcripts editor spec.
Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit
STUD-815