Quick fix for ampersand problem
Adding missing django 1.7 migration
Merge pull request #3468 from yakky/missing_migration

Adding missing django 1.7 migration
Merge pull request #3464 from yakky/feature/amp_quick_fix

Quick fix for ampersand problem