Merge branch 'hotfix/0.2.2' into develop
remove use of simplejson
Merge branch 'hotfix/0.2.3' into develop
Add app "taskmonitor" to replace "get_task_count".
Add eventlet to dev procfile.
Add LilyIMAP which adds `with` support for an IMAP server connection.
Add IMAPConnectionError to catch exceptions during all IMAP requests.
Disable a few pylint warnings.
Merge branch 'feature/proper-task-count' into develop
Hotfix: Fixed email forms
Remove mwsadmin theme from the project completely
Merge branch 'feature/LILY-98-django-pipeline' into develop
Merge branch 'hotfix/0.2.5' into develop
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