Prevent from tabbing on tos and honor links
fix non-microsite SUBDOMAIN_BRANDING defaults
Fix sys.path manipulation in pavement.py, with detailed comment
Restore reverted changes from paver part 1
Fix STUD-1316

This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.

[STUD-1316]
Merge pull request #2628 from cpennington/fix-stud-1316

Fix STUD-1316
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.

Conflicts:
	lms/envs/dev.py
Merge pull request #2650 from edx/zoldak/dbt-onto-release

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
add ability to delete comments on responses in discussions.
Disable course listing perf test
Call unicode() instead of str() for textbook IDs

STUD-1327
Merge pull request #2661 from edx/zoldak/disable-new-test

Disable course listing perf test
Protect Acid XBlock test from stale element or zero-length locator list
Merge branch 'release'
Merge pull request #2639 from edx/will/bok-choy-test-robustness

Will/bok choy test robustness
Adding XML into to individual problem types
Update and linkify our README file
Merge pull request #2662 from edx/db/textbook-id-unicode

Call unicode() instead of str() for textbook IDs
Converting Time module to JS.
Fix bug multiple choice with video. BLD-788.

The Video element contains an input with type file. When the
Check button was clicked for the multiple choice problem, the
code was acting in different ways when there as a Video on the
page and when there wasn't. This is because in the check_fd()
method there was a selector that was looking for inputs of type
file on the whole page instead of just in the current problem.
When there was a Video pn the page, the page-wide selector
returned the Video's file input, and the check_fd() method
went on believing that the multiple choice has a file input.

The correct way is to look for file inputs only in the current
element.

Added a Jasmine JavaScript unit test.

BLD-788.
Merge pull request #2618 from edx/valera/fix_multiple_choice_video

Fix bug multiple choice with video. BLD-788.