Merge branch 'release/0.3.0' into develop
Merge branch 'hotfix/0.3.1' into develop
Merge branch 'hotfix/0.3.2' into develop
Merge branch 'hotfix/0.3.3' into develop
Merge branch 'hotfix/0.3.4' into develop
Merge branch 'hotfix/0.3.5' into develop
Added explicit fields definition to EmailTemplateForm.
Upped version.
Merge branch 'release/django-17'