These had been failing for a while.

This shouldn't have been 404'ing...

Jbau/lti/customizable

middleware for CMS logging out all sneakpeek users

remove unnecessary psycopg2 requirement

Conflicts:
	cms/djangoapps/contentstore/views/checklist.py
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/sock.html
	cms/urls.py
	common/djangoapps/student/views.py
	common/lib/capa/capa/tests/test_targeted_feedback.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/lti_module.py
	common/lib/xmodule/xmodule/tests/test_lti20_unit.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_access.py
	lms/djangoapps/courseware/tests/test_courses.py
	lms/djangoapps/courseware/tests/test_lti_integration.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/templates/courseware/course_navigation.html
	lms/templates/dashboard/_dashboard_course_listing.html
	lms/templates/navigation.html
	requirements/edx/github.txt

Giulio/unauth tos footer style

Hotfix 2014-06-11

Allow users that have unregistered from a verified course to re-register.

Fixes LMS-2830

Harvard annotations on hotfix

Original changes found in this commit
https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca
3512bb085eb

Conflicts:
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py

Reverting commit @3bfb633f and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py

Text Annotation Tool: Added Instructor Filter and Clear Search

Video Annotation Tool: Added Instructor Filter

Image Annotation Tool: Added Instructor Filter

Image Annotation Tool: Annotation Mode for AB Testing

Annotation Tools PR Fixes

- forgot to overwrite the previous line

Annotation Tools: PR Fixes

- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA

Annotator Tools: OpaqueKeys update for Notes

Annotation Tools: Added CommonAnnotatorMixin

Annotator Tool: Fixed delete bug and factored out settings

Removed print context

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
	lms/djangoapps/notes/views.py

Annotation Tools: Load Tinymce in student_view

Annotation Tools: Fixing tests for student_view

Fixed typo from autocomplete

Fixed dict for tests

Fix performance regression

Flowerhack/conditional module rendering

About pages need basic support for lists since professors often want to display lists or 'definitions'

Sarina/other ok fixes

Sarina/fix openended logging