Merge branch 'hotfix/more_bug_fixes'
Add captcha to registration form
Merge branch 'hotfix/bug_fix' into develop