Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py

Allow custom formatting of due date strings.

Remove unimplemented steps from certificates acceptance test code

Fix acceptance tests to capture images for paid cert flow

Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.

STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.

Mock mongo event tracking backend during tests

Add mock package to RTD requirements

Fix error encoding datetime objects in the event track logger backend

strip processed fields in instructor dash

The function json.dumps was being called with incorrect arguments,
causing an infinite recursion when serializing an event containing
datetime objects

Re-enable signature checking of Software Secure postbacks

Update discussion.md

Do not store expanded action URLs.

Fixes extra 'file' that was leftover locally after import

Force save of photo_id_key on upload

Adam/welcome email

Wait for flash to load before trying to detect a camera

Remove dogstatsd-python in favor of dogapi

They are not portable. STUD-681.

Minor updates.

fix templates

Change course id limit to 65.