Adding django default log handlers into logging configuration
Updating settings and requirements for lms and cms to support file upload
updating ora2 version
Updating AWS settings
overriding a few more log levels for acceptance tests
disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones
Fixing calculator hint to display correct definition of the constant T
Update the UserSignUpSource model
Merge pull request #4403 from edx/asadiqbal08/usersignupsource_model_updation_for_user_id

(WIP) Updated the user_id_id field of UserSignUpSource model
Fix anonymous posts appear are labeled with the logged in user's role
FOR-156
Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output

Clytwynec/clean up lettuce output
Add new Transifex languages

Filipino, Marathi, Serbian, Telugu, Uzbek
Update translations (autogenerated message)
Merge pull request #4406 from edx/sarina/071414-language-update

Sarina/071414 language update
Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service

Updating settings and requirements for platform to support file upload
Updating release tag for July 14th, 2014
Merge pull request #4383 from mlkwaqas/waqas/for156-anonymous-posts-labels-user-roles

Fix anonymous posts appear are labeled with the logged in user's role
Refactor split migrator
LMS-2936

Also, a bunch of ancillary cleanups.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_publish.py

Conflicts:
	cms/djangoapps/contentstore/management/commands/migrate_to_split.py
	cms/djangoapps/contentstore/management/commands/tests/test_rollback_split_course.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_migrator.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
Merge pull request #4405 from pdpinch/fix-calc-definition-of-T

Fixing calculator hint to display correct definition of the constant T
Revising policy key names to match new UI