Merge branch 'hotfix/0.2.3'
Hotfix: Fixed email forms
Merge branch 'hotfix/0.2.4'
Fix ajax forms not working with new formsets code
Merge branch 'hotfix/0.2.5'
Merge branch 'hotfix/0.2.5' into develop
Fix formset fields ajax error correctly
Merge branch 'hotfix/0.2.6' into develop
LILY-139: Improve historylist show it shows what the operation was of an email (sent, reply, reply all, forwarded)
Merge branch 'feature/LILY-139-enhance-historylist' into develop
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
LILY-335: Made clearer what the second website field is when creating/updating an account