diff --git a/.gitignore b/.gitignore
index 334e9da7e..9ea483ecd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 !.gitignore
+.htaccess
 data/
 test/
 sirgle/
diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index 4b735294c..ff14489dd 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -101,7 +101,7 @@ $colspan = 11;
         </th>
         <th scope="col"><?php echo subject_sort_link('gr_id') ?>그룹아이디</a></th>
         <th scope="col"><?php echo subject_sort_link('gr_subject') ?>제목</a></th>
-        <?php if ($is_admin == 'super'){ ?><th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th><?php } ?>
+        <th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th>
         <th scope="col">게시판</th>
         <th scope="col">접근<br>사용</th>
         <th scope="col">접근<br>회원수</th>
@@ -144,7 +144,7 @@ $colspan = 11;
             <label for="gr_admin_<?php echo $i; ?>" class="sound_only">그룹관리자</label>
             <input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>" id="gr_admin_<?php echo $i ?>" class="frm_input" size="10" maxlength="20">
         <?php }else{ ?>
-            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><td><?php echo $row['gr_admin'] ?>
+            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><?php echo $row['gr_admin'] ?>
         <?php } ?>
         </td>
         <td class="td_numsmall"><a href="./board_list.php?sfl=a.gr_id&amp;stx=<?php echo $row['gr_id'] ?>"><?php echo $row2['cnt'] ?></a></td>
diff --git a/adm/sendmail_test.php b/adm/sendmail_test.php
index eadc627cf..ace86fe89 100644
--- a/adm/sendmail_test.php
+++ b/adm/sendmail_test.php
@@ -17,21 +17,21 @@ if (isset($_POST['email'])) {
     for ($i=0; $i<count($email); $i++)
         mailer($config['cf_title'], $config['cf_admin_email'], trim($email[$i]), '[메일검사] 제목', '<span style="font-size:9pt;">[메일검사] 내용<p>이 내용이 제대로 보인다면 보내는 메일 서버에는 이상이 없는것입니다.<p>'.G5_TIME_YMDHIS.'<p>이 메일 주소로는 회신되지 않습니다.</span>', 1);
 
-    echo '<section class=\'cbox\'>';
+    echo '<section>';
     echo '<h2>결과메세지</h2>';
-    echo '<p>';
+    echo '<div class="local_desc01 local_desc"><p>';
     echo '다음 '.count($email).'개의 메일 주소로 테스트 메일 발송이 완료되었습니다.';
-    echo '</p>';
+    echo '</p></div>';
     echo '<ul>';
     for ($i=0;$i<count($email);$i++) {
         echo '<li>'.$email[$i].'</li>';
     }
     echo '</ul>';
-    echo '<p>';
+    echo '<div class="local_desc02 local_desc"><p>';
     echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오.<br>';
     echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오.<br>';
     echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오.<br>';
-    echo '</p>';
+    echo '</p></div>';
     echo '</section>';
 }
 ?>
diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index b7e1d1d57..4c8866942 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -542,7 +542,7 @@ if(!isset($default['de_root_index_use'])) {
         <tr>
             <th scope="row"><label for="de_kcp_site_key">KCP SITE KEY</label></th>
             <td>
-                <?php echo help("25자리 영대문자와 숫자 - 그리고 _ 로 이루어 집니다. SITE KEY 발급 KCP 전화: 1544-8660\n예) 1Q9YRV83gz6TukH8PjH0xFf__"); ?>
+                <?php echo help("25자리 영대소문자와 숫자 - 그리고 _ 로 이루어 집니다. SITE KEY 발급 KCP 전화: 1544-8660\n예) 1Q9YRV83gz6TukH8PjH0xFf__"); ?>
                 <input type="text" name="de_kcp_site_key" value="<?php echo $default['de_kcp_site_key']; ?>" id="de_kcp_site_key" class="frm_input" size="32" maxlength="25">
             </td>
         </tr>
@@ -727,7 +727,7 @@ if(!isset($default['de_root_index_use'])) {
                 <?php echo help("관련상품의 경우 등록된 상품은 모두 출력하므로 '출력할 줄 수'는 설정하지 않습니다. 이미지높이를 0으로 설정하면 상품이미지를 이미지폭에 비례하여 생성합니다."); ?>
                 <label for="de_rel_list_skin">스킨</label>
                 <select name="de_rel_list_skin" id="de_rel_list_skin">
-                    <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
+                    <?php echo get_list_skin_options("^relation.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
                 </select>
                 <label for="de_rel_img_width">이미지폭</label>
                 <input type="text" name="de_rel_img_width" value="<?php echo $default['de_rel_img_width']; ?>" id="de_rel_img_width" class="frm_input" size="3">
diff --git a/adm/shop_admin/itemexcelupdate.php b/adm/shop_admin/itemexcelupdate.php
index c64495a3f..796fb461f 100644
--- a/adm/shop_admin/itemexcelupdate.php
+++ b/adm/shop_admin/itemexcelupdate.php
@@ -2,6 +2,10 @@
 $sub_menu = '400300';
 include_once('./_common.php');
 
+// 상품이 많을 경우 대비 설정변경
+set_time_limit ( 0 );
+ini_set('memory_limit', '50M');
+
 auth_check($auth[$sub_menu], "w");
 
 function only_number($n)
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 568137a4e..bf22eee2c 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -505,11 +505,6 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit
                 <tbody>
                 <?php if ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체') { ########## 시작?>
                 <?php
-                // 주문서
-                $sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
-                $result = sql_query($sql);
-                $od = sql_fetch_array($result);
-
                 if ($od['od_settle_case'] == '무통장')
                 {
                     // 은행계좌를 배열로 만든후
diff --git a/config.php b/config.php
index d4ad12e70..27820488d 100644
--- a/config.php
+++ b/config.php
@@ -156,4 +156,7 @@ define('G5_SMTP', '127.0.0.1');
 // 게시판에서 링크의 기본개수를 말합니다.
 // 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오.
 define('G5_LINK_COUNT', 2);
+
+// 썸네일 jpg Quality 설정
+define('G5_THUMB_JPG_QUALITY', 90);
 ?>
\ No newline at end of file
diff --git a/install/library.check.php b/install/library.check.php
index 96e77ce3f..e1cfe0e06 100644
--- a/install/library.check.php
+++ b/install/library.check.php
@@ -12,6 +12,9 @@ function die_utf8($msg)
 if(!extension_loaded('gd') || !function_exists('gd_info'))
     die_utf8('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
 
+if(!extension_loaded('openssl'))
+    die_utf8('openssl 모듈을 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
+
 // SOAP 모듈체크
 if(!extension_loaded('soap') || !class_exists('SOAPClient'))
     die_utf8('SOAP 확장모듈을 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 26a9b6758..b16e8d2df 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1662,8 +1662,8 @@ function time_select($time, $name="")
 // DEMO 라는 파일이 있으면 데모 화면으로 인식함
 function check_demo()
 {
-    global $g5;
-    if (file_exists($g5['path'].'/DEMO'))
+    global $is_admin;
+    if ($is_admin != 'super' && file_exists(G5_PATH.'/DEMO'))
         alert('데모 화면에서는 하실(보실) 수 없는 작업입니다.');
 }
 
diff --git a/lib/latest.lib.php b/lib/latest.lib.php
index 6786c4be1..71dad15bc 100644
--- a/lib/latest.lib.php
+++ b/lib/latest.lib.php
@@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit;
 
 // 최신글 추출
 // $cache_time 캐시 갱신시간
-function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1)
+function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1, $options='')
 {
     global $g5;
     //static $css = array();
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index caf04acc1..3f71de35a 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -356,7 +356,12 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
         UnsharpMask($dst, $val[0], $val[1], $val[2]);
     }
 
-    imagejpeg($dst, $thumb_file, 90);
+    if(!defined('G5_THUMB_JPG_QUALITY'))
+        $jpg_quality = 90;
+    else
+        $jpg_quality = G5_THUMB_JPG_QUALITY;
+
+    imagejpeg($dst, $thumb_file, $jpg_quality);
     chmod($thumb_file, G5_FILE_PERMISSION); // 추후 삭제를 위하여 파일모드 변경
 
     imagedestroy($src);
diff --git a/mobile/index.php b/mobile/index.php
index 2359ac1ee..514a3223e 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -7,7 +7,7 @@ include_once(G5_MOBILE_PATH.'/_head.php');
 <!-- 메인화면 최신글 시작 -->
 <?php
 //  최신글
-$sql = " select bo_table from {$g5['board_table']} where bo_device <> 'pc' order by gr_id, bo_table ";
+$sql = " select bo_table from `{$g5['board_table']}` a left join `{$g5['group_table']}` b on (a.gr_id=b.gr_id)  where a.bo_device <> 'pc' order by b.gr_order, a.bo_order ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++) {
     // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php
index 74115f47b..5a4184b95 100644
--- a/mobile/skin/board/basic/write.skin.php
+++ b/mobile/skin/board/basic/write.skin.php
@@ -157,7 +157,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
+        <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php
index 30870dc4c..9c6805945 100644
--- a/mobile/skin/board/gallery/write.skin.php
+++ b/mobile/skin/board/gallery/write.skin.php
@@ -157,7 +157,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
+        <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/mobile/skin/qa/basic/write.skin.php b/mobile/skin/qa/basic/write.skin.php
index cbadd6028..c7fa1e568 100644
--- a/mobile/skin/qa/basic/write.skin.php
+++ b/mobile/skin/qa/basic/write.skin.php
@@ -110,7 +110,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="<?php echo $list_href; ?>" class="btn_cancel">목록</a>
     </div>
     </form>
diff --git a/shop/cartupdate.php b/shop/cartupdate.php
index 948c6f0d8..351c58669 100644
--- a/shop/cartupdate.php
+++ b/shop/cartupdate.php
@@ -221,7 +221,7 @@ else // 장바구니에 담기
             if($it['it_sc_type'] > 1 && $it['it_sc_method'] == 1)
                 $ct_send_cost = 1;
 
-            $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '{$it['it_name']}', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )";
+            $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '".addslashes($it['it_name'])."', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )";
             $comma = ' , ';
             $ct_count++;
         }
diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php
index 8b74c24a2..07eb7f676 100644
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@@ -173,7 +173,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php
index 8b74c24a2..07eb7f676 100644
--- a/skin/board/gallery/write.skin.php
+++ b/skin/board/gallery/write.skin.php
@@ -173,7 +173,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/skin/qa/basic/write.skin.php b/skin/qa/basic/write.skin.php
index ced9ba8a7..817e8f943 100644
--- a/skin/qa/basic/write.skin.php
+++ b/skin/qa/basic/write.skin.php
@@ -110,7 +110,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="<?php echo $list_href; ?>" class="btn_cancel">목록</a>
     </div>
     </form>
diff --git a/skin/shop/basic/relation.10.skin.php b/skin/shop/basic/relation.10.skin.php
new file mode 100644
index 000000000..8bc26da40
--- /dev/null
+++ b/skin/shop/basic/relation.10.skin.php
@@ -0,0 +1,98 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+?>
+
+<link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
+
+<!-- 상품진열 10 시작 { -->
+<?php
+for ($i=1; $row=sql_fetch_array($result); $i++) {
+    if ($this->list_mod >= 2) { // 1줄 이미지 : 2개 이상
+        if ($i%$this->list_mod == 0) $sct_last = ' sct_last'; // 줄 마지막
+        else if ($i%$this->list_mod == 1) $sct_last = ' sct_clear'; // 줄 첫번째
+        else $sct_last = '';
+    } else { // 1줄 이미지 : 1개
+        $sct_last = ' sct_clear';
+    }
+
+    if ($i == 1) {
+        if ($this->css) {
+            echo "<ul class=\"{$this->css}\">\n";
+        } else {
+            echo "<ul class=\"sct sct_10\">\n";
+        }
+    }
+
+    echo "<li class=\"sct_li {$sct_last}\" style=\"width:{$this->img_width}px\">\n";
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_img\">\n";
+    }
+
+    if ($this->view_it_img) {
+        echo get_it_image($row['it_id'], $this->img_width, $this->img_height, '', '', stripslashes($row['it_name']))."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_id) {
+        echo "<span class=\"sct_id\">&lt;".stripslashes($row['it_id'])."&gt;</span>\n";
+    }
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_txt\">\n";
+    }
+
+    if ($this->view_it_name) {
+        echo stripslashes($row['it_name'])."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_basic && $row['it_basic']) {
+        echo "<div class=\"sct_basic\">".stripslashes($row['it_basic'])."</div>\n";
+    }
+
+    if ($this->view_it_cust_price || $this->view_it_price) {
+
+        echo "<div class=\"sct_cost\">\n";
+
+        if ($this->view_it_cust_price && $row['it_cust_price']) {
+            echo "<strike>".display_price($row['it_cust_price'])."</strike>\n";
+        }
+
+        if ($this->view_it_price) {
+            echo display_price(get_price($row), $row['it_tel_inq'])."\n";
+        }
+
+        echo "</div>\n";
+
+    }
+
+    if ($this->view_it_icon) {
+        echo "<div class=\"sct_icon\">".item_icon($row)."</div>\n";
+    }
+
+    if ($this->view_sns) {
+        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
+        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
+        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
+        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
+        echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_goo.png');
+        echo "</div>\n";
+    }
+
+    echo "</li>\n";
+}
+
+if ($i > 1) echo "</ul>\n";
+
+if($i == 1) echo "<p class=\"sct_noitem\">등록된 상품이 없습니다.</p>\n";
+?>
+<!-- } 상품진열 10 끝 -->
\ No newline at end of file