render the recaptcha widget insde the form-group
Merge branch 'captcha' into development
tests for settings-change user email
Merge branch 'tests' into development
fix merge