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
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
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
add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob

fix broken unit test

add some unit tests