Fixes #789 Cookie domain suggested wrong with ".dev" TLD
Feature #557 CAPTCHA Options
Merge remote-tracking branch 'upstream/feature' into feature-557
Feature #587 Publicly shown poll end date
Feature #587 - Updates template version
Merge pull request #794 from PaulBender/feature-557

Feature #557 CAPTCHA Options
Merge pull request #791 from Stefan-ST/fix-789

Fixes #789 Cookie domain suggested wrong with ".dev" TLD
Merge pull request #806 from Polarbear541/feature-587

Feature #587 Publicly shown poll end date