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
Change video transcripts to use locators instead of locations.

Part of STUD-870
Fix LTI max_score method.
Add min value.
Make has_score to be XField insted of decriptor property.
Fix LTI tests.
Make runone work with more test output.
fix typo in ORA template (ORA-136)
settings.MITX_FEATURES => settings.FEATURES
Fall back on MITX_FEATURES env variable if FEATURES isn't found

For a smoother transition to the new world
Encode header row (LMS-197)
Disable Peer Track Changes
STUD-1008
Merge pull request #1790 from edx/christina/transcripts

Change video transcripts to use locators instead of locations.
Merge pull request #1827 from edx/db/remove-mitx-from-features

settings.MITX_FEATURES => settings.FEATURES
mitx_markdown => edx_markdown
New Updated Studio Documentation

New documentation from rewrite, audit, and integration of some
documentation from edx101.  Intent to release by training on 12/5.