i18n tests don't regenerate checked-in eo files
Merge pull request #2839 from edx/sarina/fix-rake-i18n

Skip generation of 'eo' files in i18n test suite
Add method to clear mako template lookups

Quick and dirty fix (edxapp.startup.run is called twice, once before
loading the configuration, so the paths defined in lms.startup are
basically ignored).
Fix typo in transcripts_utils.
Merge pull request #2835 from edx/dcadams/fix_class_dashboard_setting

Moved CLASS_DASHBOARD setting into the FEATURES dict.
Release notes 3-3-14

DOC-72
External URL change in Files & Upoads

STUD-1314
Merge pull request #2719 from edx/markhoeber/documentation/stud-1314

External URL change in Files & Upoads
Merge pull request #2799 from edx/markhoeber/documentation/release-notes-3-4-14

First Draft release notes 3-3-14
Merge pull request #2837 from ionis-education-group/shopping-cart-unicode-fix

Fix unicode issue in shopping cart
Fix Paul-Olivier Dehaye's AUTHOR entry.
Add Han Su Kim to AUTHORS
Merge pull request #2702 from carsongee/cg/cas_fixes

Correct misaligned django-cas integration
Add option for importing a course from a named branch of a git repo
Merge remote-tracking branch 'origin/master' into release, conflicts resolved

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
Merge branch 'release'
Make course_id a required arg to split.create_course
and remove attempt to make it unique. Instead raise exception on dupe.
STUD-1359
Only add mentoring application to INSTALLED_APPS when in virtualenv
Fixed bug of checking out the same branch multiple times and code review fixes
Translator comments and language fixes
Merge pull request #2283 from carsongee/cg/feature/git_branch_import

Add option for importing a course from a named branch of a git repo