Fixed migrations so future migrations don't mess up
LILY-359: Only show 1 copy of an email in the historylist
Merge branch 'feature/LILY-359-only-show-unique-emails-in-historylist' into develop