Fix typo in #5392 (encodeURICoponont)
Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version

fix tests. Update Admin views/forms.

enforce uniqueness constraint in the Admin ModelForm submissions

Update bok_choy cached DBs with new schema changes

PR feedback
Fix unicode-related failures in CSV upload.

TNL-586
Merge pull request #5524 from edx/dan-f/fix-student-profile-csv-unicode-2

Fix unicode-related failures in CSV upload.
Merge pull request #5523 from edx/hotfix/2014-10-08

Hotfix for 2014-10-08
Merge pull request #5531 from edx/release

Merge Release