adding fallback if no javascript for email form
Merge branch 'hotfix/0.0.1.6'