first implementation of feedback captchas (unfinished)
Merge branch 'develop' into feature-feedback-captcha
Merge branch 'develop' into feature-feedback-captcha

Conflicts:
	app/models/user.rb
	app/views/devise/registrations/new.html.haml
	app/views/transactions/edit.html.haml
	app/views/transactions/step2.html.haml
for #662
test fixes for recaptcha issues
Merge branch 'feature-feedback-captcha' into develop