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

adm/shop_admin/orderformcartupdate.php

@@ -251,6 +251,10 @@ if (in_array($_POST['ct_status'], $status_cancel)) {
                             $pg_res_msg = $xpay->Response_Msg();
                         }
                         break;
+                    case 'toss':
+                        $cancel_msg = '쇼핑몰 운영자 승인 취소';
+                        include_once(G5_SHOP_PATH.'/toss/toss_cancel.php');
+                        break;
                     case 'inicis':
                         include_once(G5_SHOP_PATH.'/settle_inicis.inc.php');
                         $cancel_msg = '쇼핑몰 운영자 승인 취소';