Issue #2152409: Resend e-mails Form API key may prevent resending e-mails.
Issue #2182345: Included Email Value tokens not included in template unless checked in configuration.
Issue #2195583 by DanChadwick: Submission token values duplicating in custom email template.
Revert "Issue #2195583 by DanChadwick: Submission token values duplicating in custom email template."

This reverts commit eee3004e4270ad814c71ac8df1d22ce04508e32b.
Issue #2195583 by DanChadwick: Submission token values duplicating in custom email template.
Issue #2195913 by pjcdawkins: Call to undefined function webform_component_list().
Issue #1813200: Validation of field type number fails for decimal separator.
Issue #2114983 by spheresh: Provide more specific error messages for date components.
Issue #2114983 by spheresh: Provide more specific error messages for date components.
Issue #1789040 by SpadXIII: File upload does not work with conditional rules.
Merge tag '7.x-4.0-beta3' of git://drupalcode.org/project/webform