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.
Merge branch 'release'
Show full diffs in ResponseType tests.
Make runone work with more test output.
mitxmako => edxmako
Add basic tests of gradeset iteration.
Merge pull request #1816 from edx/ormsbee/grading_tests

Add basic tests of gradeset iteration.
Merge pull request #1824 from edx/ned/show-full-diff-in-responsetype-tests

Show full diffs in ResponseType tests.
fix typo in ORA template (ORA-136)
Merge pull request #1823 from edx/db/mitxmako-edxmako

mitxmako => edxmako
settings.MITX_FEATURES => settings.FEATURES