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