Hotfix for Sep 12, 2014

Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/course.py
	cms/envs/test.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/views.py
	common/lib/xmodule/xmodule/lti_module.py
	common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
	common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
	lms/djangoapps/courseware/tests/test_lti_integration.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py
	lms/djangoapps/verify_student/tests/test_views.py
	lms/djangoapps/verify_student/views.py
	lms/envs/common.py
	lms/envs/devstack.py
	lms/static/sass/multicourse/_account.scss
	lms/templates/main_django.html
	lms/templates/navigation.html
	lms/templates/registration/password_reset_complete.html
	lms/templates/registration/password_reset_confirm.html
	lms/urls.py
	pavelib/utils/test/utils.py
	requirements/edx/base.txt
	requirements/edx/github.txt