Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

Fix/cdodge/filesystem xml fixes

Added 2 new instructor tools

Fix bug related to creation of thumbnails for non-image files.

https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2

Another minor tweak to limit these tests to the cms.

A couple of bug fixes.

Lets explicitly make the virtualenvs for now.

https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet

#117

Add a try/catch so that Askbot removal doesn't die if there's no Askbot ...

Feature/christina/misc

Feature/brian/pearson reg

Feature/victor/beta testers

Update to the FAQ page

display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands.

Feature/vik/add staff grading notifications

Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations

pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately