Merge branch 'hotfix/0.2.32.2'
Fixed js and added indexes for email
Merge branch 'hotfix/0.2.32.3'
Basic implementation of default email templates
Merge branch 'feature/awesome-email-templates' into develop
LILY-453: Improved email compose when replying
Merge branch 'feature/LILY-453-fix-email-styling-on-reply' into develop
Fix 'Cannot add *: instance is on database 'default', value is on database 'None' error
Add Procfile.local to ignore
LILY-519: Make sure email addresses are always lowercase
Merge branch 'feature/LILY-519-make-email-addresses-lowercase' into develop
celery-beat-schedule to .gitignore
Add werkzeug to requirements-dev.txt
Fix FolderView messagesaccounts FieldError
Fix typo in label of smtp_host field
Hotfix: Add phone numbers to account
Finished hotfix 0.2.32.4.

Conflicts:
	lily/static/lily/scripts/forms/select2.js
LILY-514: fixed registration & user invite
LILY-476: Add 'send and archive' button