Merge branch 'hotfix/0.2.5'
Fix formset fields ajax error correctly
Merge branch 'hotfix/0.2.6'
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
Fix keyerror from mediagenerator
LILY-335: Updated edit/add account so it's clearer what the second website field is for
Merge branch 'feature/LILY-335-description-for-extra-websites-unclear' into develop
Added check to make sure migration doesn't fail
Fixed errors
Added removed template for emailbody
Fixed migration email and south migration issue
LILY-128: Fix saving and sending drafts with attachments
LILY-163: Immediate read unread (before syncing with remote)
LILY-128: removed unnecessary modal css
Merge branch 'feature/LILY-128-del-attach-drafts' into develop

Conflicts:
	lily/messaging/email/urls.py
	lily/messaging/email/views.py