forms.EmailField compatibility with Django 1.6

In Django 1.6 confirm_email = forms.EmailField("Confirm email",...) fails with error that we are trying to specify id as string.
We need to specify explicitly that "Confirm email" is label.
Merge branch 'confirm_contact_email' into custom_form_rendering
Merge branch 'custom_form_rendering' into address_model
Merge branch 'address_model' into edit_addresses