Added explicit fields definition to EmailTemplateForm.
Upped version.
Merge branch 'release/django-17' into develop