Conflicts:
	CHANGELOG.rst
	common/djangoapps/track/views.py
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

Conflicts:
	lms/envs/common.py
	lms/urls.py

Hotfix/2013 09 19

Rc/2013 09 18

Conflicts:
	lms/envs/common.py

- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos

Hotfix/lti typo

This reverts commit acd23ad9.

a few missed placeholder conversions in verification sass

Improve retry logic for Stale Element Exceptions

LMS: resolves direct class name references to extends that have been con...

Update changelong for due_date_display_format.

Better exception retry logic

Change methods to lambdas

in XML deserializations, we can get get floats for start/stop times, so ...

Conflicts:
	lms/static/sass/views/_verification.scss

Make sure audit enrollments are really marked audit.

in XML deserializations, we can get get floats for start/stop times, so we need to be able to parse those

add test video with float-based end-time

LMS: resolves direct class name references to extends that have been converted to placeholder Sass syntax

Fix forums nav sidebar overlapping content

Remove unused XModuleDescriptor.get_sample_state method

Fix/cdodge/courseware index perf tweek

we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB

fix line indents

apache lms wsgi fix

Jbau/edx west/release wsgi fix