requests version 1.2.3 does not appear to be compatible with the
new version of requests-oauthlib.

requests-oathlib tries to import to_native_string in util.py:

```
File
"/root/.virtualenvs/edx-platform/local/lib/python2.7/site-packages/requests_oauthlib/oauth1_auth.py",
line 10, in <module>
    from requests.utils import to_native_string
ImportError: cannot import name to_native_string
```

(cherry picked from commit c54b8db6)

Add LTI type to metrics tab grade reports

Allow <img> tags in LTI2.0 feedback

Release on 2014-06-26

pin LTI scores to 2 decimal places

Impose the following restrictions on setting up sneakpeek
* Has to be a GET
* Cannot be a machine callback to handler from xqueue or xblock
* Cannot be trying to list the LTI endpoints

Bugfix for the following condition:
When anonymous (e.g., non-registered) access is enabled for a course,
and that course also uses the /request_certificate endpoint (e.g., via
the "Grade Me" button), anonymous users could request to be graded and
given certificates.

As a matter of policy, Stanford doesn't want to give certificates to
anonymous students.

Also adds defensive error checks in several more places.

Adds /instructor/api/irc_instructor_auth_token API endpoint which
returns a JSON blob including a per-course magic key iff the logged-in
user is an instructor in the course.

Squashing commits

Transition to Oqaque Keys

Bug fixes

Fixing regenerate_user

- Use OpaqueKeys exception
- Remove unused imports
- Clean up syntax
- Remove superfluous print statment

There is a bug I need to fix when a student re-visits a problem that they
had solved previously without masking enabled, their old state does not
load correclty.

It's simplest to turn off masking now, and re-enable it with the whole fix.

The change here is a small deletion to remove the masking=True logic, and more
lengthy changes to adjust the tests.

conditionally do template includes to fix lms tests

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/views.py

Conflicts:
	lms/djangoapps/courseware/views.py

Fixes some stuff in metrics tab
  Fixes some 500s after opaque-keys
  Adds a test which would have caught the 500s
  Fixes Transifex problem on the string % of students

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