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

Updating settings and requirements for platform to support file upload

Sarina/071414 language update

Filipino, Marathi, Serbian, Telugu, Uzbek

Clytwynec/clean up lettuce output

(WIP) Updated the user_id_id field of UserSignUpSource model

Bug/stud 1962

Testing for bugs off master for opaque-keys deprecation
LMS-2753

Pull out edX into variables in password reset email

Fix opaque key TODOs left over from split-migrator changes and fixed test_image_import to use the correct course

Reset get_location_from_path to pre deprecated opaque-keys

Fix CMS acceptance test

Fixed usage key reassignment in item.py

Remove unnecessary check.
Fix merge conflict

Add filter to only show first occurance of DepWarning

Handle unicode in get_course_index

Since we're trying to get rid of location mapper,
skip these tests until we get rid of it entirely.

Setting default system to be lms in unittests

Defensively checks that children exist in has_changes

Disable failing video language test

disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones

Added discussion label change to release notes