Merge remote-tracking branch '그누보드/master'

# Conflicts:
#	adm/shop_admin/orderform.php
#	bbs/register_form_update.php
#	lib/common.lib.php
#	mobile/shop/personalpayform.sub.php
#	plugin/htmlpurifier/extend.video.php
#	plugin/kcaptcha/kcaptcha.lib.php
#	shop/orderformupdate.php
#	skin/social/social_register_member.skin.php
#	version.php

plugin/kcaptcha/kcaptcha.lib.php

@@ -278,6 +278,8 @@ function captcha_html($class="captcha")
     $html .= "\n".'#captcha.m_captcha {border:1px solid #ddd; width: 100%; padding: 10px; box-sizing: border-box; border-radius: 6px; text-align:center}';
     $html .= "\n".'</style>';
     return $html;
+    
+    return run_replace('kcaptcha_captcha_html', $html, $class);
 }