Merge branch 'hotfix/0.2.6'
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
Fix KeyError for 'typography.css'
Fixed JavaScript error when element doesn't exist
Merge branch 'develop'
Moved debug tools to only be used when in debug mode
Merge branch 'develop'
Ready for new deploy
Merge branch 'master' into develop
Updated _generated_media_names
Merge branch 'master' into develop