add captcha2
Merge branch 'apop_int'