Merge branch 'hotfix/0.2.9'
Hotfix: Email Compose template now loads wysihtml5 css
Merge branch 'hotfix/0.2.10'
Hotfix: Email Compose template now loads wysihtml5 css properly
Merge branch 'hotfix/0.2.11'
Merge branch 'release/0.2.12'

Conflicts:
	lily/static/lily/scripts/inbox.js
Merge branch 'master' into develop