LMS: add CSRF token to register form
Add Neurolit to AUTHORS file
Removed custom response load test
Merge branch 'release'

Conflicts:
	cms/djangoapps/contentstore/views/item.py
Merge pull request #1635 from edx/adam/edit-course-in-studio

fixes Edit Course In Studio link on instr dash (LMS-1455)
Merge pull request #1629 from edx/adam/fix/enrollment-count-intr-dash

makes beta dash count active users in enrollment count [AN-115]
Merge pull request #1644 from edx/will/remove-load-test

Removed custom response load test
Mock servers shouldn't pollute test output.

BY writing to stderr, BaseHTTPRequestHandler writes log messages to the
console during testing.  This makes the output harder to interpret.
Write the log messages to stdout instead, so that test runners will
suppress them during passing tests, and show them during failing tests.

It would be nice to have a place to write this method just once for the
Youtube and LTI mock servers, but we don't seem to have a place for code
as common as that.
Add in a new hook for people who are embargoed in the verified cert track.

LMS-1477
BLD-489: Fix JavaScript tests.
Merge pull request #1521 from edx/ned/quiet-mock-youtube-test-server

Mock servers shouldn't pollute test output.
Merge pull request #1623 from edx/valera/fix_js_error_transcripts_editor_spec

Fix JavaScript typo in transcripts editor spec.
Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit
STUD-815
Run pylint against modules again, rather than against files
Added devstack settings

Fixed pep8/pylint violations

Added email feature flags; use full names for pylint disables
Merge pull request #1602 from edx/will/local-dev-settings

Added devstack settings
Merge pull request #1646 from cpennington/fix-pylint-count

Run pylint against modules again, rather than against files
BLD-457: Fix speed menu when YouTube is unavailable.
Added granular permissions for managing wiki articles
LMS-1355
Merge pull request #1640 from edx/jbau/fix/remove-revision-from-middleware

Jbau/fix/remove revision from middleware