Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py

Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data

Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields

readding Julian Arni's update to definition

Table order fix (again), changes a single character

add management command to regrade partial-credit problems affected by ge...

hot fix for delete_item. The 'delete_all_versions' is useful in that it ...

Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads

Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads

hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection

Fix/vik/oe pep8

Update course factory to reflect XBlock changes

Fix/vik/oe xblock stage2

Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads