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
Disable Peer Track Changes
STUD-1008
Merge pull request #1860 from edx/hotfix/no-error-messages

removes temporary error messages
update npm package name to edx
more i18n work
Events for entering verified flow & buying
Added refund datetime info to Orders, OrderItems

Finance would like to have info about the date any given refund is requested.

This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.

When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.

Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
Response to CR
Quick fix
Response to CR
Added alternate upsell copy flag

For waffle / split testing purposes
add all clear message
Merge pull request #1864 from edx/adam/add-all-clear-message

add all clear message
New release notes project

added files for past dates
test