Merge branch 'rc/2014-07-02' into testmergemaster

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
Remove sidebar class from forum nav

This will enable much cleanup of the relevant SASS rules.
Clean up forum nav Sass

Now that the sidebar class is no longer used, many rules no longer need
!important and can move out of _shame.scss.
Add myself to AUTHORS.
Asset support in split
LMS-2876
Allow to_deprecated_string to do its magic
Fix the link to the Ubuntu installation instructions
Merge pull request #4320 from edx/merge-rc-to-master

Merge rc to master
Updating settings and requirements for lms and cms to support file upload
updating ora2 version
ORA2 release-2014-07-07T19.28
Merge pull request #4323 from edx/will/ora2-release-2014-07-07T19.28

ORA2 release-2014-07-07T19.28
Fix user handling bug in split test module

STUD-1948
Merge pull request #4326 from edx/andya/fix-stud-1948

Fix user handling bug in split test module
Always call `git fetch edx` before finding PR branches
Merge pull request #4341 from edx/db/release-script-always-fetch

Always call `git fetch edx` before finding PR branches
removing unused import
Updating AWS settings
Merge pull request #4333 from edx/ned/fix-readme-links

Fix the link to the Ubuntu installation instructions
Fix i18n bug on Studio's Advanced Settings page

STUD-1955

HTML escaped localized text that was output to
JavaScript.