Fixed missing read (cut/paste f'up)

Speed up Location creation returning existing locations where possible

Turn Locations into dicts less often

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py

Moving unregistration of change listener into asset_index.html.

Build passed when ran manually (automatic one is running now).

Add extra error checking and logging to Software Secure callback

Fixes broken integration test on master.

manage focus to/from/within password reset modal appropriately

Conditionalize written feedback area.

Jbau/shib bugfixes

Add setting on combinedopenended to allow peergrading of finished submissions

Implement a save button for open ended responses

Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays

make it so that mathplayer message only appears when mathjax is on the p...

don't remove comments from xml module

save lock state in contentstore

Fix OE AJAX post error

Add in peer grading tests to cover linking behavior

Improve accessibility for forums post toolbar

Add -q (quiet) flag to pip install

Accessibility: Account-based Template Follow-up

Mention in studio UI that %%USER_ID%% works