Release for Mar 18, 2014

Conflicts:
	common/djangoapps/student/views.py
	common/lib/capa/capa/tests/test_responsetypes.py
	common/lib/xmodule/xmodule/capa_base.py
	lms/djangoapps/branding/__init__.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/class_dashboard/test/test_dashboard_data.py
	lms/djangoapps/class_dashboard/test/test_views.py
	lms/djangoapps/class_dashboard/views.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/envs/test.py
	lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee
	lms/templates/class_dashboard/all_section_metrics.js
	lms/templates/class_dashboard/d3_stacked_bar_graph.js
	lms/templates/courseware/course_about.html
	lms/templates/courseware/instructor_dashboard.html
	lms/templates/dashboard.html
	lms/templates/dashboard/_dashboard_certificate_information.html
	lms/templates/instructor/instructor_dashboard_2/metrics.html
	lms/templates/main.html
	lms/urls.py