Ahodges/documentation/betatesting2

acct activation required; discussion and wiki posts. Added
cross-reference and info on executing tests when viewing a live course

Ahodges/documentation/discussiondata

Documentation updates to add missing fields and verify descriptions of existing fields for discussion data

Conflicts:
	lms/templates/courseware/accordion.html

Add tests of the frontend children api using the AcidXBlock

This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.

Use new setting for LMS deadline display instead TIME_ZONE

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.

Call unicode() instead of str() for textbook IDs

Will/bok choy test robustness

Disable course listing perf test

STUD-1327

django_comment_client: add unit test for (sub)comment deletion.

JIRA: FOR-470

Markhoeber/documentation/release notes 2 19 14

allow STUDENT_FILEUPLOAD_MAX_SIZE to be configured in aws.py

Grading chapter enhancements

STUD-1211

Markhoeber/documentation/stud 1316

try to get courses by django groups for non global users

STUD-1133

Have xml modulestore only load course in course_ids if provided

Adam/i18n self assessment 3

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

update strings

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

Fix STUD-1316

Update information about rescoring submissions

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]