Features by Jeff Ericson and Nick Parlante squashed
down to one commit.

-shuffle of choices within a choicegroup (Nick)
-answer-pool subsetting within a choicegroup (Jeff)
-masking of choice names within a choicegroup, (Nick)
 used by shuffle and answer-pool
-targeted-feedback within a multiplechoiceresponse (Jeff)
-delay-between-submissions capa feature (Jeff)

Allow templates override.

Release for Feb 05, 2014

Conflicts:
	cms/templates/widgets/sock.html
	common/djangoapps/student/models.py
	common/djangoapps/student/views.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/branding/views.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/notification_prefs/tests.py
	lms/djangoapps/notification_prefs/views.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/envs/test.py
	lms/templates/courseware/course_about.html
	lms/templates/courseware/courseware.html
	lms/templates/index.html
	lms/templates/main.html
	lms/templates/main_django.html
	lms/templates/peer_grading/peer_grading_problem.html
	lms/urls.py

This reverts commit 528d1b03.

This reverts commit e639738e.

This reverts commit ef2f20a6.

LMS-2203

HACKED TOGETHER time limit for DB class midterm

Make receipt-ids actually generate UUIDs

LMS-2192

rc/2014-02-05

JIRA: FOR-452

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.

Allow new response pagination parameters to pass through thread model.

Add OG title and description to course about pages

Clean up strings in the ErrorModule

Pass component display name to Mako template

Add initial languages, ready for dark-launch

Fix find courses page title in bok choy test suite

JIRA: FOR-374

Mark strings that were causing test failures as unicode

i18n input field on login page (LMS-2159)