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
Set empty aws credentials to None.
sending template pdf with certificate request
fixing some typos
Fixed password reset message

LMS-1507
CSV Reporting of Shopping Cart Purchases, with tests

squashing to one commit to make cherry-picking by feature possible
Basic test fix
Recover from error loading forum thread list

When a user attempts to load more threads in the forum navigation
sidebar, reset the state of the world so the user can retry, and alert
the user appropriately.
Add focus trap on forum navigation thread loading

For accessibility purposes, it is bad to allow a user to initiate
loading of additional threads in the navigation sidebar and then shift
focus away from the sidebar, only to have focus snap back when the
additional threads are loaded. Now, we trap focus on the loading element
as recommended by our accessibility consultant.

JIRA: FOR-238
changes to allow multiple choicetextresponses in one problem
Fix bug in grabbing course enrollments.

LMS-1475
Update AUTHORS
Removed null bits
Merge pull request #1693 from edx/flowerhack/fix/password-reset-messages

Fixed password reset message
Increased timeout for element count in HTML test
revises .gitignore file to include static css directories and remnants of devstack setup