Merge branch 'AddCaptcha' into herokuprod