Merge pull request #4 from xpressengine/develop

Develop
2026-01-07 02:31:40 +09:00 · 2015-07-17 00:56:53 +09:00 · 2015-07-17 00:56:53 +09:00 · 0930e0d993
commit 0930e0d993
parent 22d91ed342 ec5a496327
147 changed files with 7546 additions and 4155 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,22 @@
-config.user.inc.php
 .DS_Store
 Thumbs.db
+
+config.user.inc.php
 /files/
 /build/
+
+codeception.yml
+/tests/_output/
+/tests/*.suite.yml
+
 /node_modules/
+/bower_components/
 /vendor/
-tests/_output/*
+composer.phar
+composer.lock
+
+.idea
+*.sublime-workspace
+*.sublime-project
+.codeintel
+
--- a/.travis.yml
+++ b/.travis.yml
@ -15,16 +15,15 @@ before_script:
 - npm install -g grunt-cli
 - npm install
 - if [ $(phpenv version-name) != "5.3" ]; then composer install; fi
- if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;';
-  fi
+- if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;'; fi
 - if [ $(phpenv version-name) != "5.3" ]; then echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis')
  WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root; fi
 - if [ $(phpenv version-name) != "5.3" ]; then php -S localhost:8000 & fi
 script:
 - grunt lint
 - grunt minify
- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run --env travis;
-  fi
+- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept build; fi
+- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi
 notifications:
  slack:
-    secure: V4p13KlqML94RK0KTlHNJwrdwOK1K6n7sfxs6oILCJTqBfGuqN2fCglnxX78QEUwnl8LWrwSdA4AnUVfZqv6N5g7zlDDr2ZU2+a4XVApmEss3/C0g9zsYNlFfkJqChvtMsV29UiBjSfqn/coAVLtY1wbCYJYk3Wc2nmB/3Qti9Y=
+    secure: 0HhwktIb65zfge56E4yMfYj0Xj4GeYIaxvh/Obb13BK1/C8RdWBy6u213N5MQ2UHsxYk8wXXzynaCh4psegi2iPy9dbKmkdAdEQMzYoKE2xYVSqZveeVQm0sqFVXAlzggpgs/j5vtvKYjRkQKtTrz0C+p0uJ0bkLcyWGezWTpGc=
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -112,7 +112,6 @@ module.exports = function(grunt) {
 			},
 			'layout': {
 				files: {
-					'layouts/xedition/js/jquery.easing.min.js': ['layouts/xedition/js/jquery.easing.js'],
 					'layouts/xedition/js/layout.min.js': ['layouts/xedition/js/layout.js'],
 					'layouts/xedition/js/welcome.min.js': ['layouts/xedition/js/welcome.js'],
 				}
@ -148,7 +147,6 @@ module.exports = function(grunt) {
 			},
 			'layout': {
 				files: {
-					'layouts/xedition/css/camera.min.css': ['layouts/xedition/css/camera.css'],
 					'layouts/xedition/css/layout.min.css': ['layouts/xedition/css/layout.css'],
 					'layouts/xedition/css/webfont.min.css': ['layouts/xedition/css/webfont.css'],
 					'layouts/xedition/css/welcome.min.css': ['layouts/xedition/css/welcome.css'],
--- a/addons/captcha/captcha.min.js
+++ b/addons/captcha/captcha.min.js
--- a/addons/captcha_member/captcha.min.js
+++ b/addons/captcha_member/captcha.min.js
--- a/addons/oembed/jquery.oembed.min.js
+++ b/addons/oembed/jquery.oembed.min.js
--- a/addons/oembed/oembed.min.js
+++ b/addons/oembed/oembed.min.js
@ -1 +1 @@
-!function(a){var b="(https?|ftp|news|telnet|irc|mms)://",c="(?:[\\w\\-]+\\.)+(?:[a-z]+)",d="(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])",e="(?:"+d+"\\.){3}"+d,f="(?::([0-9]+))?",g="(?:/~[\\w-]+)?",h='((?:/[\\w!"$-/:-@]+)*)',i="(?:#([\\w!-@]+))?",j=new RegExp("("+b+"("+c+"|"+e+"|localhost)"+f+g+h+i+")","ig"),k=xe.createPlugin("OEmbed",{targets:[],init:function(){this.targets=[],this.enableAutoLink=!1,this.castedOembedA=!1,this.embedSetting=[]},API_ONREADY:function(){var b=this;this.extractTargets(a(".xe_content")),this.oApp.getPlugin("autolink").length&&(this.enableAutoLink=!0),b.cast("OEMBEDA"),this.enableAutoLink||a(this.targets).each(function(){b.cast("OEMBED",[this])})},API_BEFORE_AUTOLINK:function(){var a=this;a.cast("OEMBEDA")},API_AFTER_AUTOLINK:function(a,b){this.oembed(b[0])},API_OEMBED:function(b,c){if(!this.enableAutoLink){var d=c[0];if(!a(d).parent().length||"a"==a(d).parent().get(0).nodeName.toLowerCase())return void this.oembed(a(d));var e=d.nodeValue,f=a("<span>");e=e.replace(/</g,"&lt;").replace(/>/g,"&gt;"),e=e.replace(j,'<a href="$1" target="_blank">$1</a>'),a(d).before(f),a(d).replaceWith(e),c[0]=f.next("a"),f.remove(),this.oembed(c[0])}},API_OEMBEDA:function(){if(!this.castedOembedA){var b=this;this.castedOembedA=!0,a(".read_body a").not("_oembed").each(function(){b.oembed(a(this))})}},oembed:function(b){var c=this;this.embedSetting.maxWidth||(this.embedSetting.maxWidth=a(".xe_content").width()),b&&(b&&3==b.nodeType&&(b=a(b)),b.oembed(null,c.embedSetting).addClass("_oembed"))},extractTargets:function(b){var c=this,d=a(".xe_content",b);return d.length?void this.extractTargets(d):void a(b).contents().each(function(){var b=this.nodeName.toLowerCase();if(-1==a.inArray(b,["a","pre","xml","textarea","input","select","option","code","script","style","iframe","button","img","embed","object","ins"]))if(j.exec(""),3==this.nodeType){var d=this.nodeValue;if(d.length<5)return;if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(d))return;c.targets.push(this)}else c.extractTargets(this)})}});xe.registerPlugin(new k)}(jQuery);
+!function(a){var b="(https?|ftp|news|telnet|irc|mms)://",c="(?:[\\w\\-]+\\.)+(?:[a-z]+)",d="(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])",e="(?:"+d+"\\.){3}"+d,f="(?::([0-9]+))?",g="(?:/~[\\w-]+)?",h='((?:/[\\w!"$-/:-@]+)*)',i="(?:#([\\w!-@]+))?",j=new RegExp("("+b+"("+c+"|"+e+"|localhost)"+f+g+h+i+")","ig"),k=xe.createPlugin("OEmbed",{targets:[],init:function(){this.targets=[],this.enableAutoLink=!1,this.castedOembedA=!1,this.embedSetting=[]},API_ONREADY:function(){var b=this;this.extractTargets(a(".xe_content")),this.oApp.getPlugin("autolink").length&&(this.enableAutoLink=!0),b.cast("OEMBEDA"),this.enableAutoLink||a(this.targets).each(function(){b.cast("OEMBED",[this])})},API_BEFORE_AUTOLINK:function(a,b){var c=this;c.cast("OEMBEDA")},API_AFTER_AUTOLINK:function(a,b){this.oembed(b[0])},API_OEMBED:function(b,c){if(!this.enableAutoLink){var d=c[0];if(!a(d).parent().length||"a"==a(d).parent().get(0).nodeName.toLowerCase())return void this.oembed(a(d));var e=d.nodeValue,f=a("<span>");e=e.replace(/</g,"&lt;").replace(/>/g,"&gt;"),e=e.replace(j,'<a href="$1" target="_blank">$1</a>'),a(d).before(f),a(d).replaceWith(e),c[0]=f.next("a"),f.remove(),this.oembed(c[0])}},API_OEMBEDA:function(b,c){if(!this.castedOembedA){var d=this;this.castedOembedA=!0,a(".read_body a").not("_oembed").each(function(){d.oembed(a(this))})}},oembed:function(b){var c=this;this.embedSetting.maxWidth||(this.embedSetting.maxWidth=a(".xe_content").width()),b&&(b&&3==b.nodeType&&(b=a(b)),b.oembed(null,c.embedSetting).addClass("_oembed"))},extractTargets:function(b){var c=this,d=a(".xe_content",b);return d.length?void this.extractTargets(d):void a(b).contents().each(function(){var b=this.nodeName.toLowerCase();if(-1==a.inArray(b,["a","pre","xml","textarea","input","select","option","code","script","style","iframe","button","img","embed","object","ins"]))if(j.exec(""),3==this.nodeType){var d=this.nodeValue;if(d.length<5)return;if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(d))return;c.targets.push(this)}else c.extractTargets(this)})}});xe.registerPlugin(new k)}(jQuery);
--- a/addons/resize_image/js/resize_image.min.js
+++ b/addons/resize_image/js/resize_image.min.js
@ -1 +1 @@
-!function(a){function b(){var b,c,e,f,g,h=a(document.body);return d?(b=a("#xe_gallery_controls"),c=a("#xe_gallery_holder"),e=a("#xe_gallery_closebtn"),f=a("#xe_gallery_prevbtn"),g=a("#xe_gallery_nextbtn")):(d=a("<div>").attr("id","xe_gallery_screen").css({position:"fixed",display:"none",backgroundColor:"black",zIndex:500,opacity:.7}),b=a("<div>").attr("id","xe_gallery_controls").css({position:"fixed",display:"none",overflow:"hidden",zIndex:510}),f=a('<button type="button" id="xe_gallery_prevbtn" />').css({left:"10px",backgroundPosition:"0 -64px"}).click(function(){d.xePrev()}).appendTo(b),e=a('<button type="button" id="xe_gallery_closebtn" />').css({top:"10px",backgroundPosition:"0 0"}).click(function(){d.xeHide()}).appendTo(b),g=a('<button type="button" id="xe_gallery_nextbtn" />').attr("id","xe_gallery_nextbtn").css({right:"10px",backgroundPosition:"0 -128px"}).click(function(){d.xeNext()}).appendTo(b),b.find(">button").css({position:"absolute",width:"64px",height:"64px",zIndex:530,cursor:"pointer",border:0,margin:0,padding:0,backgroundColor:"transparent",backgroundImage:"url("+request_uri+"addons/resize_image/btn.png)",backgroundRepeat:"no-repeat",opacity:".5",filter:"alpha(opacity=50)"}).mouseover(function(){a(this).css({opacity:"1",filter:"alpha(opacity=100)"})}).mouseout(function(){a(this).css({opacity:".5",filter:"alpha(opacity=50)"})}).focus(function(){a(this).trigger("mouseover")}).blur(function(){a(this).trigger("mouseout")}),c=a(new Image),c.attr("id","xe_gallery_holder").css({border:"5px solid white",zindex:520,maxWidth:"none",borderRadius:"5px",boxShadow:"0 0 10px #000"}).appendTo(b).draggable(),h.append(d).append(b),c.live("load",function(){var b=a(window).width(),d=a(window).height();c.css({left:b/2-c.width()/2+"px",top:d/2-c.height()/2+"px"})}),d.xeShow=function(){var b=(a(window).width(),a(window).height());a("#xe_gallery_controls,#xe_gallery_screen").show().css({top:0,right:0,bottom:0,left:0}),a("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top",Math.round(b/2-32)+"px"),this.xeMove(0)},d.xeHide=function(){d.hide(),b.hide()},d.xePrev=function(){this.xeMove(-1)},d.xeNext=function(){this.xeMove(1)},d.xeMove=function(b){var d=a(window).width(),h=a(window).height();this.index+=b,f.css("visibility",this.index>0?"visible":"hidden"),g.css("visibility",this.index<this.list.size()-1?"visible":"hidden");var i=this.list.eq(this.index).attr("rawsrc");i||(i=this.list.eq(this.index).attr("src")),c.attr("src",i).removeAttr("width").removeAttr("height"),c.width()>0&&c.css({left:d/2-c.width()/2+"px",top:h/2-c.height()/2+"px"}),e.css({left:d/2-32+"px",top:"10px"}).focus()},a(document).keydown(function(a){return 27==a.which?(d.xeHide(),!1):!0})),d}function c(){var c=a(this).closest(".xe_content"),d=c.find("img[rel=xe_gallery]"),e=a.inArray(a(this).get(0),d.get()),f=b();f.list=d,f.index=e,f.xeShow()}var d=null;a(window).load(function(){function b(a,c){if(c||(c=0),!(c>=10)){var d=this,e={width:d.width(),height:d.height()};if(!e.width||!e.height)return void setTimeout(function(){b.call(d,a,++c)},200);if(!(e.width<=a)){var f=a/e.width;d.removeAttr("width").removeAttr("height").css({width:a,height:parseInt(e.height*f,10)})}}}var d=/(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i,e=/(?:common\/tpl\/images\/blank\.gif$)/i,f=a('<div style="height:1px;overflow:hidden;opacity:0;display:block;clear:both"></div>');a(".xe_content").each(function(){var g=f.appendTo(this).width();f.remove(),g&&(a("img",this).each(function(){var c=a(this),f=c.attr("src");(!d.test(f)||e.test(f))&&(c.attr("rel","xe_gallery"),b.call(c,g))}),a("img[rel=xe_gallery]",this).live("mouseover",function(){var b=a(this);b.parent("a").length||b.attr("onclick")||b.css("cursor","pointer").click(c)}))})})}(jQuery);
+!function(a){function b(){var b,c,e,f,g,h=a(document.body);return d?(b=a("#xe_gallery_controls"),c=a("#xe_gallery_holder"),e=a("#xe_gallery_closebtn"),f=a("#xe_gallery_prevbtn"),g=a("#xe_gallery_nextbtn")):(d=a("<div>").attr("id","xe_gallery_screen").css({position:"fixed",display:"none",backgroundColor:"black",zIndex:500,opacity:.7}),b=a("<div>").attr("id","xe_gallery_controls").css({position:"fixed",display:"none",overflow:"hidden",zIndex:510}),f=a('<button type="button" id="xe_gallery_prevbtn" />').css({left:"10px",backgroundPosition:"0 -64px"}).click(function(){d.xePrev()}).appendTo(b),e=a('<button type="button" id="xe_gallery_closebtn" />').css({top:"10px",backgroundPosition:"0 0"}).click(function(){d.xeHide()}).appendTo(b),g=a('<button type="button" id="xe_gallery_nextbtn" />').attr("id","xe_gallery_nextbtn").css({right:"10px",backgroundPosition:"0 -128px"}).click(function(){d.xeNext()}).appendTo(b),b.find(">button").css({position:"absolute",width:"64px",height:"64px",zIndex:530,cursor:"pointer",border:0,margin:0,padding:0,backgroundColor:"transparent",backgroundImage:"url("+request_uri+"addons/resize_image/btn.png)",backgroundRepeat:"no-repeat",opacity:".5",filter:"alpha(opacity=50)"}).mouseover(function(){a(this).css({opacity:"1",filter:"alpha(opacity=100)"})}).mouseout(function(){a(this).css({opacity:".5",filter:"alpha(opacity=50)"})}).focus(function(){a(this).trigger("mouseover")}).blur(function(){a(this).trigger("mouseout")}),c=a(new Image),c.attr("id","xe_gallery_holder").css({border:"5px solid white",zindex:520,maxWidth:"none",borderRadius:"5px",boxShadow:"0 0 10px #000"}).appendTo(b).draggable(),h.append(d).append(b),c.live("load",function(){var b=a(window).width(),d=a(window).height();c.css({left:b/2-c.width()/2+"px",top:d/2-c.height()/2+"px"})}),d.xeShow=function(){var b=(a(window).width(),a(window).height());a("#xe_gallery_controls,#xe_gallery_screen").show().css({top:0,right:0,bottom:0,left:0}),a("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top",Math.round(b/2-32)+"px"),this.xeMove(0)},d.xeHide=function(a){d.hide(),b.hide()},d.xePrev=function(){this.xeMove(-1)},d.xeNext=function(){this.xeMove(1)},d.xeMove=function(b){var d=a(window).width(),h=a(window).height();this.index+=b,f.css("visibility",this.index>0?"visible":"hidden"),g.css("visibility",this.index<this.list.size()-1?"visible":"hidden");var i=this.list.eq(this.index).attr("rawsrc");i||(i=this.list.eq(this.index).attr("src")),c.attr("src",i).removeAttr("width").removeAttr("height"),c.width()>0&&c.css({left:d/2-c.width()/2+"px",top:h/2-c.height()/2+"px"}),e.css({left:d/2-32+"px",top:"10px"}).focus()},a(document).keydown(function(a){return 27==a.which?(d.xeHide(),!1):!0})),d}function c(c){var d=a(this).closest(".xe_content"),e=d.find("img[rel=xe_gallery]"),f=a.inArray(a(this).get(0),e.get()),g=b();g.list=e,g.index=f,g.xeShow()}var d=null;a(window).load(function(){function b(a,c){if(c||(c=0),!(c>=10)){var d=this,e={width:d.width(),height:d.height()};if(!e.width||!e.height)return void setTimeout(function(){b.call(d,a,++c)},200);if(!(e.width<=a)){var f=a/e.width;d.removeAttr("width").removeAttr("height").css({width:a,height:parseInt(e.height*f,10)})}}}var d=/(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i,e=/(?:common\/tpl\/images\/blank\.gif$)/i,f=a('<div style="height:1px;overflow:hidden;opacity:0;display:block;clear:both"></div>');a(".xe_content").each(function(){var g=f.appendTo(this).width();f.remove(),g&&(a("img",this).each(function(){var c=a(this),f=c.attr("src");(!d.test(f)||e.test(f))&&(c.attr("rel","xe_gallery"),b.call(c,g))}),a("img[rel=xe_gallery]",this).live("mouseover",function(){var b=a(this);b.parent("a").length||b.attr("onclick")||b.css("cursor","pointer").click(c)}))})})}(jQuery);
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@ -1384,7 +1384,7 @@ class Context
 			{
 				$result[$k] = $v;

-				if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc())
+				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					$result[$k] = stripslashes($result[$k]);
 				}
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@ -4,35 +4,6 @@
 if(!defined('__XE_LOADED_DB_CLASS__'))
 {
 	define('__XE_LOADED_DB_CLASS__', 1);
-
-	require(_XE_PATH_ . 'classes/xml/xmlquery/DBParser.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/QueryParser.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/argument/Argument.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/argument/SortArgument.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/argument/ConditionArgument.class.php');
-
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/Expression.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/SelectExpression.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/InsertExpression.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/UpdateExpression.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/ClickCountExpression.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/table/Table.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/table/JoinTable.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/table/CubridTableWithHint.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/table/MysqlTableWithHint.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/table/MssqlTableWithHint.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/table/IndexHint.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/condition/ConditionGroup.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/condition/Condition.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/condition/ConditionWithArgument.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/condition/ConditionWithoutArgument.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/condition/ConditionSubquery.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/expression/StarExpression.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/order/OrderByColumn.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/limit/Limit.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/Query.class.php');
-	require(_XE_PATH_ . 'classes/db/queryparts/Subquery.class.php');
 }

 /**
@ -323,8 +294,7 @@ class DB

 			unset($oDB);
 			require_once($class_file);
-			$tmp_fn = create_function('', "return new {$class_name}();");
-			$oDB = $tmp_fn();
+			$oDB = new $class_name();

 			if(!$oDB)
 			{
@ -622,7 +592,6 @@ class DB
 		// if there is no cache file or is not new, find original xml query file and parse it
 		if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
 		{
-			require_once(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php');
 			$oParser = new XmlQueryParser();
 			$oParser->parse($query_id, $xml_file, $cache_file);
 		}
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@ -116,7 +116,7 @@ class DBCubrid extends DB
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.9.0", "<") &&
+		if(version_compare(PHP_VERSION, "5.4.0", "<") &&
 				get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@ -99,7 +99,7 @@ class DBMssql extends DB
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc())
+		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@ -131,7 +131,7 @@ class DBMysql extends DB
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc())
+		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
--- a/classes/db/DBMysqli.class.php
+++ b/classes/db/DBMysqli.class.php
@ -87,7 +87,7 @@ class DBMysqli extends DBMysql
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc())
+		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
--- a/classes/db/DBMysqli_innodb.class.php
+++ b/classes/db/DBMysqli_innodb.class.php
@ -145,7 +145,7 @@ class DBMysqli_innodb extends DBMysql
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc())
+		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@ -39,12 +39,10 @@ class DisplayHandler extends Handler
 		// Extract contents to display by the request method
 		if(Context::get('xeVirtualRequestMethod') == 'xml')
 		{
-			require_once(_XE_PATH_ . "classes/display/VirtualXMLDisplayHandler.php");
 			$handler = new VirtualXMLDisplayHandler();
 		}
 		else if(Context::getRequestMethod() == 'XMLRPC')
 		{
-			require_once(_XE_PATH_ . "classes/display/XMLDisplayHandler.php");
 			$handler = new XMLDisplayHandler();
 			if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 			{
@ -53,17 +51,14 @@ class DisplayHandler extends Handler
 		}
 		else if(Context::getRequestMethod() == 'JSON')
 		{
-			require_once(_XE_PATH_ . "classes/display/JSONDisplayHandler.php");
 			$handler = new JSONDisplayHandler();
 		}
 		else if(Context::getRequestMethod() == 'JS_CALLBACK')
 		{
-			require_once(_XE_PATH_ . "classes/display/JSCallbackDisplayHandler.php");
 			$handler = new JSCallbackDisplayHandler();
 		}
 		else
 		{
-			require_once(_XE_PATH_ . "classes/display/HTMLDisplayHandler.php");
 			$handler = new HTMLDisplayHandler();
 		}

--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@ -60,6 +60,10 @@ class HTMLDisplayHandler

 		$output = $oTemplate->compile($template_path, $tpl_file);

+		// SECISSUE https://github.com/xpressengine/xe-core/issues/1583
+		$oSecurity = new Security();
+		$oSecurity->encodeHTML('is_keyword');
+
 		// add .x div for adminitration pages
 		if(Context::getResponseMethod() == 'HTML')
 		{
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@ -289,6 +289,16 @@ class ExtraItem
 		}
 	}

+	/**
+	 * Returns a value for HTML
+	 *
+	 * @return string Returns a value expressed in HTML.
+	 */
+	function getValue()
+	{	
+		return $this->_getTypeValue($this->type, $this->value);
+	}
+
 	/**
 	 * Returns a value for HTML
 	 *
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@ -527,7 +527,6 @@ class FileHandler
 			{
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
-				$oRequest->_timeout = $timeout;
 				$oRequest->addPostData('arg', serialize(array('Destination' => $url, 'method' => $method, 'body' => $body, 'content_type' => $content_type, "headers" => $headers, "post_data" => $post_data)));
 			}
 			else
@ -571,7 +570,15 @@ class FileHandler
 				if($body)
 					$oRequest->setBody($body);
 			}
-			$oRequest->setConfig('timeout', $timeout);
+			
+			if(method_exists($oRequest, 'setConfig'))
+			{
+				$oRequest->setConfig('timeout', $timeout);
+			}
+			elseif(property_exists($oRequest, '_timeout'))
+			{
+				$oRequest->_timeout = $timeout;
+			}

 			$oResponse = $oRequest->sendRequest();

--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@ -1044,31 +1044,18 @@ class ModuleHandler extends Handler
 				ModuleHandler::_getModuleFilePath($module, $type, $kind, $class_path, $high_class_file, $class_file, $instance_name);
 			}

-			// Get base class name and load the file contains it
-			if(!class_exists($module, false))
+			// Check if the base class and instance class exist
+			if(!class_exists($module, true))
 			{
-				$high_class_file = sprintf('%s%s%s.class.php', _XE_PATH_, $class_path, $module);
-				if(!file_exists($high_class_file))
-				{
-					return NULL;
-				}
-				require_once($high_class_file);
+				return NULL;
 			}
-
-			// Get the name of the class file
-			if(!is_readable($class_file))
+			if(!class_exists($instance_name, true))
 			{
 				return NULL;
 			}

-			// Create an instance with eval function
-			require_once($class_file);
-			if(!class_exists($instance_name, false))
-			{
-				return NULL;
-			}
-			$tmp_fn = create_function('', "return new {$instance_name}();");
-			$oModule = $tmp_fn();
+			// Create an instance
+			$oModule = new $instance_name();
 			if(!is_object($oModule))
 			{
 				return NULL;
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@ -236,7 +236,7 @@ class TemplateHandler
 		$buff = preg_replace('@<!--//.*?-->@s', '', $buff);

 		// replace value of src in img/input/script tag
-		$buff = preg_replace_callback('/<(?:img|input|script)[^<>]*src="(?!https?:\/\/|[\/\{])([^"]+)"/is', array($this, '_replacePath'), $buff);
+		$buff = preg_replace_callback('/<(?:img|input|script)(?:[^<>]*?)(?(?=cond=")(?:cond="[^"]+"[^<>]*)+|)[^<>]* src="(?!(?:https?|file):\/\/|[\/\{])([^"]+)"/is', array($this, '_replacePath'), $buff);

 		// replace loop and cond template syntax
 		$buff = $this->_parseInline($buff);
@ -362,6 +362,7 @@ class TemplateHandler
 			$__Context->logged_info = Context::get('logged_info');
 		}

+		$level = ob_get_level();
 		ob_start();
 		if(substr($buff, 0, 7) == 'file://')
 		{
@ -395,7 +396,12 @@ class TemplateHandler
 			}
 		}

-		return ob_get_clean();
+		$contents = '';
+		while (ob_get_level() - $level > 0) {
+			$contents .= ob_get_contents();
+			ob_end_clean();
+		}
+		return $contents;
 	}

 	/**
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@ -7,31 +7,6 @@
 if(!defined('__XE_LOADED_XML_CLASS__'))
 {
 	define('__XE_LOADED_XML_CLASS__', 1);
-
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/query/QueryTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/table/TableTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/table/HintTableTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/table/TablesTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/ColumnTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/group/GroupsTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php');
-	require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/DefaultValue.class.php');
 }

 /**
--- a/codeception.dist.yml
+++ b/codeception.dist.yml
@ -0,0 +1,11 @@
+actor: Tester
+paths:
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    helpers: tests/_support
+settings:
+    bootstrap: _bootstrap.php
+    colors: true
+    memory_limit: 1024M
+    error_level: "E_ALL & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED & ~E_NOTICE"
--- a/codeception.yml
+++ b/codeception.yml
@ -1,19 +0,0 @@
-actor: Tester
-paths:
-    tests: tests
-    log: tests/_output
-    data: tests/_data
-    helpers: tests/_support
-settings:
-    bootstrap: _bootstrap.php
-    colors: true
-    memory_limit: 1024M
-modules:
-    config:
-        Db:
-            dsn: 'mysql:host=127.0.0.1;dbname=xe_test'
-            user: 'root'
-            password: 'root'
-            populate: false
-            cleanup: false
-error_level: "E_STRICTE_ALL & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED & ~E_NOTICE"
--- a/common/js/plugins/handlebars/handlebars.min.js
+++ b/common/js/plugins/handlebars/handlebars.min.js
--- a/common/js/plugins/jquery.fileupload/css/style.css
+++ b/common/js/plugins/jquery.fileupload/css/style.css
@ -7,25 +7,27 @@

 .xefu-container {
 	margin: 10px 0;
-	border: 1px solid #B6B6B6;
+	border: 1px solid #d7d8d8;
+	border-radius: 3px;
 }
-
-/* dropzone */
+ /* dropzone */
 .xefu-dropzone {
-	border: 1px solid #EEE;
-	text-align: center;
-	background-color: #EBEBEB;
+	padding: 12px;
+	border: 1px solid #fafafa;
+	background-color: #f7f7f7;
+	border-radius: 3px;
+
 	box-sizing: border-box;
 	-moz-box-sizing: border-box;
 }
-.xefu-dropzone.in {
+.in .xefu-dropzone {
 	background-color: #E9F3EF;
 }
-.xefu-dropzone.hover {
+.hover .xefu-dropzone {
 	border: 1px dotted #9ad18f;
 	border-radius: 5px;
 }
-.xefu-dropzone.fade {
+.fade .xefu-dropzone {
 	-webkit-transition: all 0.3s ease-out;
 	-moz-transition: all 0.3s ease-out;
 	-ms-transition: all 0.3s ease-out;
@ -67,12 +69,43 @@
 	height: 60px;
 	border: 3px solid #DDD;
 }
-.xefu-list-images input,
-.xefu-list-images button {
+.xefu-list-images input {
 	position: absolute;
 	top: 0;
 	left: 0;
 }
+.xefu-act-set-cover:hover {
+	color: red;
+}
+.xefu-list-images .xefu-act-set-cover {
+	display: none;
+	cursor: pointer;
+	position: absolute;
+	top: 0;
+	left: auto;
+	right: 0;
+	margin: 0;
+	padding: 1px 0 1px 2px;
+	border: 0 none;
+	border-radius: 0 0 0 5px;
+	font-size: 15px;
+	line-height: 15px;
+	background-color: #6cbd7e;
+}
+.xefu-list-images li:hover .xefu-act-set-cover {
+	display: inline;
+	color: #666;
+	background-color: #ddd;
+}
+.xefu-list-images .xefu-is-cover-image:hover .xefu-act-set-cover,
+.xefu-is-cover-image .xefu-act-set-cover {
+	display: inline;
+	color: #fff;
+	background-color: #6cbd7e;
+}
+.xefu-is-cover-image {
+	border-color: #6cbd7e !important;
+}
 .xefu-list-images .xefu-file-name,
 .xefu-list-images .xefu-file-size {
 	display: none;
@ -84,7 +117,6 @@


 .selected {
-	border-color: #6CBD7E !important;
 }
 /* END:images */

@ -141,13 +173,9 @@
 	height: 24px !important;
 	overflow: visible;
 	border: 1px solid #bbbbbb;
-	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	border-bottom-color: #a2a2a2;
 	border-radius: 2px;
 	text-decoration: none !important;
 	text-align: center;
-	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
 	vertical-align: top;
 	line-height: 24px !important;
 	font-family: inherit;
@ -199,3 +227,33 @@ button.xefu-btn {
 	cursor: pointer;
 	background: none;
 }
+
+p.xefu-dropzone-message {
+	display: inline-block;
+	margin: 0;
+	margin-left: 5px;
+	line-height: 24px;
+	vertical-align: middle;
+}
+.xefu-dropzone:hover p.xefu-dropzone-message,
+.in .xefu-dropzone p.xefu-dropzone-message,
+.hover .xefu-dropzone p.xefu-dropzone-message,
+.fade .xefu-dropzone p.xefu-dropzone-message {
+	display: none;
+}
+.upload_info {
+	display: none;
+	margin: 0;
+	margin-left: 5px;
+	line-height: 24px;
+	vertical-align: middle;
+}
+
+.xefu-dropzone:hover .upload_info,
+.in .xefu-dropzone .upload_info,
+.hover .xefu-dropzone .upload_info,
+.fade .xefu-dropzone .upload_info {
+	display: inline-block;
+	margin: 0;
+	margin-left: 5px;
+}
--- a/common/js/plugins/jquery.fileupload/js/app.js
+++ b/common/js/plugins/jquery.fileupload/js/app.js
@ -37,7 +37,7 @@
                        // send Blob objects via XHR requests:
                        disableImageResize: /Android(?!.*Chrome)|Opera/
                            .test(window.navigator.userAgent),
-                        maxFileSize: 5000000,
+                        maxFileSize: 999000,
                        acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
                    });
                }
--- a/common/js/plugins/jquery.fileupload/js/jquery.fileupload-image.js
+++ b/common/js/plugins/jquery.fileupload/js/jquery.fileupload-image.js
@ -242,7 +242,7 @@
                                    blob.name = file.name;
                                } else if (file.name) {
                                    blob.name = file.name.replace(
-                                        /\..+$/,
+                                        /\.\w+$/,
                                        '.' + blob.type.substr(6)
                                    );
                                }
--- a/common/js/plugins/jquery.fileupload/js/jquery.fileupload.js
+++ b/common/js/plugins/jquery.fileupload/js/jquery.fileupload.js
@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.42.2
+ * jQuery File Upload Plugin 5.42.3
 * https://github.com/blueimp/jQuery-File-Upload
 *
 * Copyright 2010, Sebastian Tschan
@ -277,7 +277,8 @@
            // The following are jQuery ajax settings required for the file uploads:
            processData: false,
            contentType: false,
-            cache: false
+            cache: false,
+            timeout: 0
        },

        // A list of options that require reinitializing event listeners and/or
@ -983,7 +984,10 @@
                fileSet,
                i,
                j = 0;
-            if (limitSize && (!filesLength || files[0].size === undefined)) {
+            if (!filesLength) {
+                return false;
+            }
+            if (limitSize && files[0].size === undefined) {
                limitSize = undefined;
            }
            if (!(options.singleFileUploads || limit || limitSize) ||
@ -1344,18 +1348,19 @@
        _initDataAttributes: function () {
            var that = this,
                options = this.options,
-                clone = $(this.element[0].cloneNode(false)),
-                data = clone.data();
-            // Avoid memory leaks:
-            clone.remove();
+                data = this.element.data();
            // Initialize options set via HTML5 data-attributes:
            $.each(
-                data,
-                function (key, value) {
-                    var dataAttributeName = 'data-' +
-                        // Convert camelCase to hyphen-ated key:
-                        key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-                    if (clone.attr(dataAttributeName)) {
+                this.element[0].attributes,
+                function (index, attr) {
+                    var key = attr.name.toLowerCase(),
+                        value;
+                    if (/^data-/.test(key)) {
+                        // Convert hyphen-ated key to camelCase:
+                        key = key.slice(5).replace(/-[a-z]/g, function (str) {
+                            return str.charAt(1).toUpperCase();
+                        });
+                        value = data[key];
                        if (that._isRegExpOption(key, value)) {
                            value = that._getRegExp(value);
                        }
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@ -20,9 +20,10 @@
 		actSelectedInsertContent : '.xefu-act-link-selected',
 		actSelectedDeleteFile : '.xefu-act-delete-selected',
 		actDeleteFile : '.xefu-act-delete',
+		actSetCover : '.xefu-act-set-cover',

 		tmplXeUploaderFileitem : '<li class="xefu-file xe-clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> 선택</span></span></li>',
-		tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span></span></li>'
+		tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image {{#if cover_image}}xefu-is-cover-image{{/if}}" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span><button class="xefu-act-set-cover" data-file-srl="{{file_srl}}" title="커버이미지로 선택"><i class="xi-check-circle"></i></button></span></li>'
 	};

 	var _elements = [
@ -30,6 +31,7 @@
 		'actSelectedInsertContent',
 		'actSelectedDeleteFile',
 		'actDeleteFile',
+		'actSetCover',
 		'controll',
 		'dropZone',
 		'filelist',
@ -41,32 +43,43 @@
 	];

 	var XeUploader = xe.createApp('XeUploader', {
-		files: {},
-		selected_files: {},
 		settings: {},
-		last_selected_file: null,
-		editor_sequence: null,
 		init : function() {
 		},
 		deactivate: function() {
-			console.log(this);
 		},
 		createInstance: function(containerEl, opt) {
 			var self = this;
-			var $container = this.$container = containerEl;
+			var $container = containerEl;
 			var data = $container.data();
-			this.editor_sequence = data.editorSequence;
+
+			$.extend(data, {
+				files: {},
+				selected_files: {},
+				settings: {},
+				last_selected_file: null,
+			});
+
+			var currentEnforce_ssl = window.enforce_ssl;
+			if(location.protocol == 'https:') { window.enforce_ssl = true; }

 			var settings = {
-				url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'),
-				formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl, "mid" : window.current_mid},
-
+				url: request_uri
+				.setQuery('module', 'file')
+				.setQuery('act', 'procFileUpload')
+				.setQuery('mid', window.current_mid),
+				formData: {
+					"editor_sequence": data.editorSequence,
+					"upload_target_srl" : data.uploadTargetSrl,
+					"mid" : window.current_mid,
+					"act": 'procFileUpload'
+				},
 				dropZone: $container,
-				add: function(e, data) {
+				add: function(e, d) {
 					var dfd = jQuery.Deferred();

-					$.each(data.files, function(index, file) {
-						if(self.settings.maxFileSize <= file.size) {
+					$.each(d.files, function(index, file) {
+						if(data.settings.maxFileSize <= file.size) {
 							dfd.reject();
 							alert(window.xe.msg_exceeds_limit_size);
 							return false;
@ -75,7 +88,7 @@
 					});

 					dfd.done(function(){
-						data.submit();
+						d.submit();
 					});
 				},
 				done: function(e, res) {
@ -93,76 +106,93 @@
 					}
 				},
 				stop: function() {
-					self.loadFilelist();
+					self.loadFilelist($container);
 				},
 				start: function() {
-					self.settings.progressbarGraph.width(0);
-					self.settings.progressStatus.show();
-					self.settings.progressbar.show();
+					data.settings.progressbarGraph.width(0);
+					data.settings.progressStatus.show();
+					data.settings.progressbar.show();
 				},
-				progressall: function (e, data) {
-					var progress = parseInt(data.loaded / data.total * 100, 10);
-					self.settings.progressbarGraph.width(progress+'%');
-					self.settings.progressPercent.text(progress+'%');
+				progressall: function (e, d) {
+					var progress = parseInt(d.loaded / d.total * 100, 10);
+					data.settings.progressbarGraph.width(progress+'%');
+					data.settings.progressPercent.text(progress+'%');

 					if(progress >= 100) {
-						self.settings.progressbar.delay(3000).slideUp();
-						self.settings.progressStatus.delay(3000).slideUp();
+						data.settings.progressbar.delay(3000).slideUp();
+						data.settings.progressStatus.delay(3000).slideUp();
 					}
 				}
 			};
-			this.settings = $.extend({} , default_settings, settings, opt || {});
+			window.enforce_ssl = currentEnforce_ssl;
+
+
+			data.settings = $.extend({} , default_settings, settings, opt || {});
+			$container.data(data);

 			$.each(_elements, function(idx, val) {
-				if(typeof self.settings[val] === 'string') self.settings[val] = $container.find(self.settings[val]);
+				if(typeof data.settings[val] === 'string') data.settings[val] = $container.find(data.settings[val]);
 			});

-			var INS = $container.fileupload(this.settings)
-				.prop('disabled', !$.support.fileInput)
-				.parent()
-				.addClass($.support.fileInput ? undefined : 'disabled');
+			var INS = $container.fileupload(data.settings)
+			.prop('disabled', !$.support.fileInput)
+			.parent()
+			.addClass($.support.fileInput ? undefined : 'disabled');

 			$container.data('xefu-instance', this);

 			// 파일 목록 불러오기
-			this.loadFilelist();
+			this.loadFilelist($container);

 			// 본문 삽입
-			this.settings.actSelectedInsertContent.on('click', function() {
-				self.insertToContent();
+			data.settings.actSelectedInsertContent.on('click', function() {
+				self.insertToContent($container);
 			});

 			// 파일 삭제
-			this.settings.actSelectedDeleteFile.on('click', function() {
-				self.deleteFile();
+			data.settings.actSelectedDeleteFile.on('click', function() {
+				self.deleteFile($container);
 			});

 			// finderSelect
-			var fileselect = this.settings.fileList.finderSelect({children:"li"});
-			this.settings.fileList.on("mousedown", 'img', function(e){ e.preventDefault(); });
+			var fileselect = data.settings.fileList.finderSelect({children:"li", enableDesktopCtrlDefault:true});
+			data.settings.fileList.on("mousedown", 'img', function(e){ e.preventDefault(); });
+
 			fileselect.finderSelect('addHook','highlight:after', function(el) {
 				el.find('input').prop('checked', true);
-				var selected = self.settings.fileList.find('input:checked');
-				self.selected_files = selected;
+				var selected = data.settings.fileList.find('input:checked');
+				data.selected_files = selected;
 			});
+
 			fileselect.finderSelect('addHook','unHighlight:after', function(el) {
 				el.find('input').prop('checked', false);
-				var selected = self.settings.fileList.find('input:checked');
-				self.selected_files = selected;
+				var selected = data.settings.fileList.find('input:checked');
+				data.selected_files = selected;
 			});
+
 			fileselect.on("click", ":checkbox", function(e){
 				e.preventDefault();
 			});

+			fileselect.on("click", ".xefu-act-set-cover", function(e){
+				e.preventDefault();
+				self.setCover($container, e.currentTarget);
+			});
+
+
 			$(document).bind('dragover', function (e) {
-				var timeout = window.dropZoneTimeout;
+				var timeout = window.dropZoneTimeout,
+				dropZone = data.settings.dropZone;
+
 				if (!timeout) {
-					self.settings.dropZone.addClass('in');
+					dropZone.addClass('in');
 				} else {
 					clearTimeout(timeout);
 				}
+
 				var found = false,
 				node = e.target;
+
 				do {
 					if (node === dropZone[0]) {
 						found = true;
@ -170,16 +200,20 @@
 					}
 					node = node.parentNode;
 				} while (node != null);
+
 				if (found) {
-					self.settings.dropZone.addClass('hover');
+					dropZone.addClass('hover');
 				} else {
-					self.settings.dropZone.removeClass('hover');
+					dropZone.removeClass('hover');
 				}
+
 				window.dropZoneTimeout = setTimeout(function () {
 					window.dropZoneTimeout = null;
-					self.settings.dropZone.removeClass('in hover');
+					dropZone.removeClass('in hover');
 				}, 100);
 			});
+
+			$container.data(data);
 		},
 		done: function() {
 			// this.loadFilelist();
@ -191,13 +225,14 @@
 		unselectImageFiles: function() {},
 		unselectNonImageFiles: function() {},

-		insertToContent: function() {
+		insertToContent: function($container) {
 			var self = this;
 			var temp_code = '';
+			var data = $container.data();

-			$.each(this.selected_files, function(idx, file) {
+			$.each(data.selected_files, function(idx, file) {
 				var file_srl = $(file).data().fileSrl;
-				var fileinfo = self.files[file_srl];
+				var fileinfo = data.files[file_srl];

 				if(!fileinfo) return;

@ -210,18 +245,19 @@

 			});

-			_getCkeInstance(this.editor_sequence).insertHtml(temp_code, "unfiltered_html");
+			_getCkeInstance(data.editorSequence).insertHtml(temp_code, "unfiltered_html");
 		},
 		/**
 		 * 지정된 하나의 파일 또는 다중 선택된 파일 삭제
 		 */
-		deleteFile: function(file_srl) {
+		deleteFile: function($container, file_srl) {
 			var self = this;
 			var file_srls = [];
+			var data = $container.data();

 			if(!file_srl)
 			{
-				$.each(self.selected_files, function(idx, file) {
+				$.each(data.selected_files, function(idx, file) {
 					if(!file) return;

 					var file_srl = $(file).data().fileSrl;
@ -236,38 +272,38 @@

 			file_srls = file_srls.join(',');

-			exec_json('file.procFileDelete', {'file_srls': file_srls, 'editor_sequence': this.editor_sequence}, function() {
+			exec_json('file.procFileDelete', {'file_srls': file_srls, 'editor_sequence': data.editorSequence}, function() {
 				file_srls = file_srls.split(',');
 				$.each(file_srls, function(idx, srl){
-					self.settings.fileList.find('ul').find('li[data-file-srl=' + srl + ']').remove();
+					data.settings.fileList.find('ul').find('li[data-file-srl=' + srl + ']').remove();
 				});
-				self.loadFilelist();
+				self.loadFilelist($container);
 			});
-		},
+		 },
 		/**
 		 * 파일 목록 갱신
 		 */
-		loadFilelist: function() {
+		loadFilelist: function($container) {
 			var self = this;
-			var data = this.$container.data();
+			var data = $container.data();
 			var obj = {};
 			obj.mid = window.current_mid;
-			obj.editor_sequence = self.$container.data('editor-sequence');
+			obj.editor_sequence = data.editorSequence;

 			$.exec_json('file.getFileList', obj, function(res){
 				data.uploadTargetSrl = res.upload_target_srl;
-				editorRelKeys[self.$container.data('editor-sequence')].primary.value = res.upload_target_srl;
+				editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl;
 				data.uploadTargetSrl = res.uploadTargetSrl;

 				// @TODO 정리
-				$('.allowed_filetypes').text(res.allowed_filetypes);
-				$('.allowed_filesize').text(res.allowed_filesize);
-				$('.allowed_attach_size').text(res.allowed_attach_size);
-				$('.attached_size').text(res.attached_size);
-				$('.file_count').text(res.files.length);
+				$container.find('.allowed_filetypes').text(res.allowed_filetypes);
+				$container.find('.allowed_filesize').text(res.allowed_filesize);
+				$container.find('.allowed_attach_size').text(res.allowed_attach_size);
+				$container.find('.attached_size').text(res.attached_size);
+				$container.find('.file_count').text(res.files.length);

-				var tmpl_fileitem = self.settings.tmplXeUploaderFileitem;
-				var tmpl_fileitem_image = self.settings.tmplXeUploaderFileitemImage;
+				var tmpl_fileitem = data.settings.tmplXeUploaderFileitem;
+				var tmpl_fileitem_image = data.settings.tmplXeUploaderFileitemImage;
 				var template_fileimte = Handlebars.compile(tmpl_fileitem);
 				var template_fileimte_image = Handlebars.compile(tmpl_fileitem_image);
 				var result_image = [];
@ -275,16 +311,17 @@

 				// 첨부된 파일이 없으면 감춤
 				if(!res.files.length) {
-					self.settings.fileList.hide();
-					self.settings.controll.hide();
+					data.settings.fileList.hide();
+					data.settings.controll.hide();
 					return;
 				}

 				// 이미지와 그외 파일 분리
 				$.each(res.files, function (index, file) {
-					if(self.files[file.file_srl]) return;
+					if(data.files[file.file_srl]) return;

-					self.files[file.file_srl] = file;
+					data.files[file.file_srl] = file;
+					$container.data(data);

 					if(/\.(jpe?g|png|gif)$/i.test(file.source_filename)) {
 						result_image.push(template_fileimte_image(file));
@ -296,12 +333,27 @@
 				});

 				// 파일 목록
-				self.settings.filelistImages.append(result_image.join(''));
-				self.settings.filelist.append(result.join(''));
+				data.settings.filelistImages.append(result_image.join(''));
+				data.settings.filelist.append(result.join(''));

 				// 컨트롤, 리스트 표시
-				self.settings.controll.show()
-				self.settings.fileList.show();
+				data.settings.controll.show()
+				data.settings.fileList.show();
+			});
+		},
+		setCover: function($container, selected_el) {
+			var data = $container.data();
+			var $el = $(selected_el);
+			var file_srl = $el.data().fileSrl;
+
+			exec_json('file.procFileSetCoverImage', {'file_srl' : file_srl, 'mid' : window.current_mid, 'editor_sequence' : data.editorSequence}, function(res) {
+				if(res.error != 0) return;
+
+				data.settings.filelistImages.find('li').removeClass('xefu-is-cover-image');
+
+				var $parentLi = $el.closest('li');
+				$parentLi.addClass('xefu-is-cover-image');
+
 			});
 		}
 	});
@ -317,17 +369,6 @@

 		return u;
 	};
-
-
-	xe.unregisterApp();
-
-	// Shortcut function in XE
-	// xe.createXeUploader = function(browseButton, opts) {
-	// 	var u = new XeUploader(browseButton, opts);
-	// 	if(u) xe.registerApp(u);
-
-	// 	return u;
-	// };
 })(jQuery);


--- a/common/js/plugins/jquery.fileupload/js/main.min.js
+++ b/common/js/plugins/jquery.fileupload/js/main.min.js
--- a/common/js/x.min.js
+++ b/common/js/x.min.js
--- a/common/js/xe.min.js
+++ b/common/js/xe.min.js
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@ -6,7 +6,7 @@
 	$js_files=Context::getJsFile();
 }
 <!DOCTYPE html>
-<html lang="{$lang_type}">
+<html lang="{str_replace('jp','ja',$lang_type)}">
 <head>
 <!-- META -->
 <meta charset="utf-8">
@ -19,15 +19,15 @@
 <title>{Context::getBrowserTitle()}</title>
 <!-- CSS -->
 <block loop="$css_files=>$key,$css_file">
-<block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]></block>
+<block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]><block cond="stripos($css_file['targetie'], 'gt') === 0"><!--></block></block>
 <link rel="stylesheet" href="{$css_file['file']}" media="{$css_file['media']}"|cond="$css_file['media'] != 'all'" />
-<block cond="$css_file['targetie']"><![endif]--></block>
+<block cond="$css_file['targetie']"><block cond="stripos($css_file['targetie'], 'gt') === 0"><!--</block><![endif]--></block>
 </block>
 <!-- JS -->
 <block loop="$js_files=>$key,$js_file">
 <block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]><block cond="stripos($js_file['targetie'], 'gt') === 0"><!--></block></block>
 <script src="{$js_file['file']}"></script>
-<block cond="$js_file['targetie']"><![endif]--></block>
+<block cond="$js_file['targetie']"><block cond="stripos($js_file['targetie'], 'gt') === 0"><!--</block><![endif]--></block>
 </block>

 <!-- RSS -->
--- a/common/tpl/mobile_layout.html
+++ b/common/tpl/mobile_layout.html
@ -5,7 +5,7 @@
 	$js_files=Context::getJsFile();
 }
 <!DOCTYPE html>
-<html lang="{$lang_type}" class="xe-mobilelayout">
+<html lang="{str_replace('jp','ja',$lang_type)}" class="xe-mobilelayout">
 <head>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
@ -13,15 +13,15 @@
 <title>{Context::getBrowserTitle()}</title>
 <!-- CSS -->
 <block loop="$css_files=>$key,$css_file">
-<block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]></block>
+<block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]><block cond="stripos($css_file['targetie'], 'gt') === 0"><!--></block></block>
 <link rel="stylesheet" href="{$css_file['file']}" media="{$css_file['media']}"|cond="$css_file['media'] != 'all'" />
-<block cond="$css_file['targetie']"><![endif]--></block>
+<block cond="$css_file['targetie']"><block cond="stripos($css_file['targetie'], 'gt') === 0"><!--</block><![endif]--></block>
 </block>
 <!-- JS -->
 <block loop="$js_files=>$key,$js_file">
 <block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]><block cond="stripos($js_file['targetie'], 'gt') === 0"><!--></block></block>
 <script src="{$js_file['file']}"></script>
-<block cond="$js_file['targetie']"><![endif]--></block>
+<block cond="$js_file['targetie']"><block cond="stripos($js_file['targetie'], 'gt') === 0"><!--</block><![endif]--></block>
 </block>

 <!--// RSS -->
--- a/composer.json
+++ b/composer.json
@ -8,6 +8,7 @@
        }
    ],
    "require": {
+        "php": ">=5.4.0"
    },
    "require-dev": {
        "codeception/codeception": "~2.0",
--- a/composer.lock
+++ b/composer.lock
--- a/config/config.inc.php
+++ b/config/config.inc.php
@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
 * Display XE's full version.
 */
-define('__XE_VERSION__', '1.8.2');
+define('__XE_VERSION__', '1.8.6');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));
@ -72,12 +72,12 @@ else
 	/**
 	 * Location site
 	 */
-	define('_XE_LOCATION_SITE_', 'http://www.xpressengine.org/');
+	define('_XE_LOCATION_SITE_', 'http://www.xpressengine.com/');

 	/**
 	 * Download server
 	 */
-	define('_XE_DOWNLOAD_SERVER_', 'http://en.download.xpressengine.org/');
+	define('_XE_DOWNLOAD_SERVER_', 'http://download.xpressengine.com/');
 }

 /*
@ -282,45 +282,147 @@ if(version_compare(PHP_VERSION, '5.3.0') >= 0)
 	date_default_timezone_set(@date_default_timezone_get());
 }

-if(!defined('__XE_LOADED_CLASS__'))
+// Require a function-defined-file for simple use
+require(_XE_PATH_ . 'config/func.inc.php');
+
+if(__DEBUG__) {
+	define('__StartTime__', getMicroTime());
+}
+
+if(__DEBUG__) {
+	$GLOBALS['__elapsed_class_load__'] = 0;
+}
+
+$GLOBALS['__xe_autoload_file_map'] = array_change_key_case(array(
+	'CacheBase' => 'classes/cache/CacheHandler.class.php',
+	'CacheHandler' => 'classes/cache/CacheHandler.class.php',
+	'Context' => 'classes/context/Context.class.php',
+	'DB' => 'classes/db/DB.class.php',
+	'Query' => 'classes/db/queryparts/Query.class.php',
+	'Subquery' => 'classes/db/queryparts/Subquery.class.php',
+	'Condition' => 'classes/db/queryparts/condition/Condition.class.php',
+	'ConditionGroup' => 'classes/db/queryparts/condition/ConditionGroup.class.php',
+	'ConditionSubquery' => 'classes/db/queryparts/condition/ConditionSubquery.class.php',
+	'ConditionWithArgument' => 'classes/db/queryparts/condition/ConditionWithArgument.class.php',
+	'ConditionWithoutArgument' => 'classes/db/queryparts/condition/ConditionWithoutArgument.class.php',
+	'ClickCountExpression' => 'classes/db/queryparts/expression/ClickCountExpression.class.php',
+	'documentItem' => 'modules/document/document.item.php',
+	'DeleteExpression' => 'classes/db/queryparts/expression/DeleteExpression.class.php',
+	'Expression' => 'classes/db/queryparts/expression/Expression.class.php',
+	'InsertExpression' => 'classes/db/queryparts/expression/InsertExpression.class.php',
+	'SelectExpression' => 'classes/db/queryparts/expression/SelectExpression.class.php',
+	'StarExpression' => 'classes/db/queryparts/expression/StarExpression.class.php',
+	'UpdateExpression' => 'classes/db/queryparts/expression/UpdateExpression.class.php',
+	'UpdateExpressionWithoutArgument' => 'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php',
+	'Limit' => 'classes/db/queryparts/limit/Limit.class.php',
+	'OrderByColumn' => 'classes/db/queryparts/order/OrderByColumn.class.php',
+	'CubridTableWithHint' => 'classes/db/queryparts/table/CubridTableWithHint.class.php',
+	'IndexHint' => 'classes/db/queryparts/table/IndexHint.class.php',
+	'JoinTable' => 'classes/db/queryparts/table/JoinTable.class.php',
+	'MssqlTableWithHint' => 'classes/db/queryparts/table/MssqlTableWithHint.class.php',
+	'MysqlTableWithHint' => 'classes/db/queryparts/table/MysqlTableWithHint.class.php',
+	'Table' => 'classes/db/queryparts/table/Table.class.php',
+	'DisplayHandler' => 'classes/display/DisplayHandler.class.php',
+	'HTMLDisplayHandler' => 'classes/display/HTMLDisplayHandler.php',
+	'JSCallbackDisplayHandler' => 'classes/display/JSCallbackDisplayHandler.php',
+	'JSONDisplayHandler' => 'classes/display/JSONDisplayHandler.php',
+	'VirtualXMLDisplayHandler' => 'classes/display/VirtualXMLDisplayHandler.php',
+	'XMLDisplayHandler' => 'classes/display/XMLDisplayHandler.php',
+	'EditorHandler' => 'classes/editor/EditorHandler.class.php',
+	'ExtraVar' => 'classes/extravar/Extravar.class.php',
+	'ExtraItem' => 'classes/extravar/Extravar.class.php',
+	'FileHandler' => 'classes/file/FileHandler.class.php',
+	'FileObject' => 'classes/file/FileObject.class.php',
+	'FrontEndFileHandler' => 'classes/frontendfile/FrontEndFileHandler.class.php',
+	'Handler' => 'classes/handler/Handler.class.php',
+	'XEHttpRequest' => 'classes/httprequest/XEHttpRequest.class.php',
+	'Mail' => 'classes/mail/Mail.class.php',
+	'Mobile' => 'classes/mobile/Mobile.class.php',
+	'ModuleHandler' => 'classes/module/ModuleHandler.class.php',
+	'ModuleObject' => 'classes/module/ModuleObject.class.php',
+	'Object' => 'classes/object/Object.class.php',
+	'PageHandler' => 'classes/page/PageHandler.class.php',
+	'EmbedFilter' => 'classes/security/EmbedFilter.class.php',
+	'IpFilter' => 'classes/security/IpFilter.class.php',
+	'Password' => 'classes/security/Password.class.php',
+	'Purifier' => 'classes/security/Purifier.class.php',
+	'Security' => 'classes/security/Security.class.php',
+	'UploadFileFilter' => 'classes/security/UploadFileFilter.class.php',
+	'TemplateHandler' => 'classes/template/TemplateHandler.class.php',
+	'Validator' => 'classes/validator/Validator.class.php',
+	'WidgetHandler' => 'classes/widget/WidgetHandler.class.php',
+	'GeneralXmlParser' => 'classes/widget/GeneralXmlParser.class.php',
+	'Xml_Node_' => 'classes/xml/XmlParser.class.php',
+	'XmlGenerator' => 'classes/xml/XmlGenerator.class.php',
+	'XmlJsFilter' => 'classes/xml/XmlJsFilter.class.php',
+	'XmlLangParser' => 'classes/xml/XmlLangParser.class.php',
+	'XmlParser' => 'classes/xml/XmlParser.class.php',
+	'XmlQueryParser' => 'classes/xml/XmlQueryParser.class.php',
+	'DBParser' => 'classes/xml/xmlquery/DBParser.class.php',
+	'QueryParser' => 'classes/xml/xmlquery/QueryParser.class.php',
+	'Argument' => 'classes/xml/xmlquery/argument/Argument.class.php',
+	'ConditionArgument' => 'classes/xml/xmlquery/argument/ConditionArgument.class.php',
+	'SortArgument' => 'classes/xml/xmlquery/argument/SortArgument.class.php',
+	'DefaultValue' => 'classes/xml/xmlquery/queryargument/DefaultValue.class.php',
+	'QueryArgument' => 'classes/xml/xmlquery/queryargument/QueryArgument.class.php',
+	'SortQueryArgument' => 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php',
+	'QueryArgumentValidator' => 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php',
+	'ColumnTag' => 'classes/xml/xmlquery/tags/column/ColumnTag.class.php',
+	'InsertColumnTag' => 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php',
+	'InsertColumnTagWithoutArgument' => 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php',
+	'InsertColumnsTag' => 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php',
+	'SelectColumnTag' => 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php',
+	'SelectColumnsTag' => 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php',
+	'UpdateColumnTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php',
+	'UpdateColumnsTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php',
+	'ConditionGroupTag' => 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php',
+	'ConditionTag' => 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php',
+	'ConditionsTag' => 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php',
+	'JoinConditionsTag' => 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php',
+	'GroupsTag' => 'classes/xml/xmlquery/tags/group/GroupsTag.class.php',
+	'IndexTag' => 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php',
+	'LimitTag' => 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php',
+	'NavigationTag' => 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php',
+	'QueryTag' => 'classes/xml/xmlquery/tags/query/QueryTag.class.php',
+	'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php',
+	'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php',
+	'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php',
+), CASE_LOWER);
+
+function __xe_autoload($class_name)
 {
-	// Require a function-defined-file for simple use
-	require(_XE_PATH_ . 'config/func.inc.php');
+	if(__DEBUG__) {
+		$time_at = getMicroTime();
+	}

-	if(__DEBUG__)
-		define('__StartTime__', getMicroTime());
+	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	{
+		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
+	}
+	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	{
+		$candidate_filename = array();
+		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
+		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
+		$candidate_filename[] = 'php';

-	// include the class files
-	//TODO When _autoload() can be used for PHP5 based applications, it will be removed.
-	if(__DEBUG__)
-		define('__ClassLoadStartTime__', getMicroTime());
-	require(_XE_PATH_ . 'classes/object/Object.class.php');
-	require(_XE_PATH_ . 'classes/extravar/Extravar.class.php');
-	require(_XE_PATH_ . 'classes/handler/Handler.class.php');
-	require(_XE_PATH_ . 'classes/xml/XmlParser.class.php');
-	require(_XE_PATH_ . 'classes/xml/XmlGenerator.class.php');
-	require(_XE_PATH_ . 'classes/xml/XmlJsFilter.class.php');
-	require(_XE_PATH_ . 'classes/xml/XmlLangParser.class.php');
-	require(_XE_PATH_ . 'classes/cache/CacheHandler.class.php');
-	require(_XE_PATH_ . 'classes/context/Context.class.php');
-	require(_XE_PATH_ . 'classes/db/DB.class.php');
-	require(_XE_PATH_ . 'classes/file/FileHandler.class.php');
-	require(_XE_PATH_ . 'classes/widget/WidgetHandler.class.php');
-	require(_XE_PATH_ . 'classes/editor/EditorHandler.class.php');
-	require(_XE_PATH_ . 'classes/module/ModuleObject.class.php');
-	require(_XE_PATH_ . 'classes/module/ModuleHandler.class.php');
-	require(_XE_PATH_ . 'classes/display/DisplayHandler.class.php');
-	require(_XE_PATH_ . 'classes/template/TemplateHandler.class.php');
-	require(_XE_PATH_ . 'classes/mail/Mail.class.php');
-	require(_XE_PATH_ . 'classes/page/PageHandler.class.php');
-	require(_XE_PATH_ . 'classes/mobile/Mobile.class.php');
-	require(_XE_PATH_ . 'classes/validator/Validator.class.php');
-	require(_XE_PATH_ . 'classes/frontendfile/FrontEndFileHandler.class.php');
-	require(_XE_PATH_ . 'classes/security/Password.class.php');
-	require(_XE_PATH_ . 'classes/security/Security.class.php');
-	require(_XE_PATH_ . 'classes/security/IpFilter.class.php');
-	if(__DEBUG__)
-		$GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
+		$candidate_filename = implode('.', $candidate_filename);
+
+		if(file_exists(_XE_PATH_ . $candidate_filename))
+		{
+			require _XE_PATH_ . $candidate_filename;
+		}
+	}
+
+	if(__DEBUG__) {
+		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
+	}
+}
+spl_autoload_register('__xe_autoload');
+
+if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
+	require _XE_PATH_  . '/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */
--- a/config/func.inc.php
+++ b/config/func.inc.php
@ -724,22 +724,19 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
 		$month = (int) substr($str, 4, 2);
 		$day = (int) substr($str, 6, 2);

-		// leading zero?
-		$lz = create_function('$n', 'return ($n>9?"":"0").$n;');
-
 		$trans = array(
 			'Y' => $year,
-			'y' => $lz($year % 100),
-			'm' => $lz($month),
+			'y' => sprintf('%02d', $year % 100),
+			'm' => sprintf('%02d', $month),
 			'n' => $month,
-			'd' => $lz($day),
+			'd' => sprintf('%02d', $day),
 			'j' => $day,
 			'G' => $hour,
-			'H' => $lz($hour),
+			'H' => sprintf('%02d', $hour),
 			'g' => $hour % 12,
-			'h' => $lz($hour % 12),
-			'i' => $lz($min),
-			's' => $lz($sec),
+			'h' => sprintf('%02d', $hour % 12),
+			'i' => sprintf('%02d', $min),
+			's' => sprintf('%02d', $sec),
 			'M' => getMonthName($month),
 			'F' => getMonthName($month, FALSE)
 		);
@ -1549,11 +1546,11 @@ function requirePear()
 {
 	if(version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR");
+		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
 	}
 	else
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5");
+		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
 	}
 }

--- a/layouts/xedition/conf/info.xml
+++ b/layouts/xedition/conf/info.xml
@ -2,8 +2,8 @@
 <layout version="0.2">
 	<title xml:lang="ko">XEDITION</title>
 	<description xml:lang="ko">XE 1.8 기본 테마</description>
-	<version>1.8</version>
-	<date>2015-04-08</date>
+	<version>1.9</version>
+	<date>2015-06-25</date>
 	<author email_address="developer@xpressengine.com" link="https://www.xpressengine.com/">
 		<name xml:lang="ko">NAVER</name>
 	</author>
--- a/layouts/xedition/css/camera.css
+++ b/layouts/xedition/css/camera.css
--- a/layouts/xedition/css/camera.min.css
+++ b/layouts/xedition/css/camera.min.css
--- a/layouts/xedition/css/idangerous.swiper.css
+++ b/layouts/xedition/css/idangerous.swiper.css
@ -0,0 +1,125 @@
+/*
+ * Swiper 2.7.6
+ * Mobile touch slider and framework with hardware accelerated transitions
+ *
+ * http://www.idangero.us/sliders/swiper/
+ *
+ * Copyright 2010-2015, Vladimir Kharlampidi
+ * The iDangero.us
+ * http://www.idangero.us/
+ *
+ * Licensed under GPL & MIT
+ *
+ * Released on: February 11, 2015
+*/
+/* ===============================================================
+Basic Swiper Styles 
+================================================================*/
+.swiper-container {
+	margin:0 auto;
+	position:relative;
+	overflow:hidden;
+	direction:ltr;
+	-webkit-backface-visibility:hidden;
+	-moz-backface-visibility:hidden;
+	-ms-backface-visibility:hidden;
+	-o-backface-visibility:hidden;
+	backface-visibility:hidden;
+	/* Fix of Webkit flickering */
+	z-index:1;
+}
+.swiper-wrapper {
+	position:relative;
+	width:100%;
+	-webkit-transition-property:-webkit-transform, left, top;
+	-webkit-transition-duration:0s;
+	-webkit-transform:translate3d(0px,0,0);
+	-webkit-transition-timing-function:ease;
+	
+	-moz-transition-property:-moz-transform, left, top;
+	-moz-transition-duration:0s;
+	-moz-transform:translate3d(0px,0,0);
+	-moz-transition-timing-function:ease;
+	
+	-o-transition-property:-o-transform, left, top;
+	-o-transition-duration:0s;
+	-o-transform:translate3d(0px,0,0);
+	-o-transition-timing-function:ease;
+	-o-transform:translate(0px,0px);
+	
+	-ms-transition-property:-ms-transform, left, top;
+	-ms-transition-duration:0s;
+	-ms-transform:translate3d(0px,0,0);
+	-ms-transition-timing-function:ease;
+	
+	transition-property:transform, left, top;
+	transition-duration:0s;
+	transform:translate3d(0px,0,0);
+	transition-timing-function:ease;
+
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+}
+.swiper-free-mode > .swiper-wrapper {
+	-webkit-transition-timing-function: ease-out;
+	-moz-transition-timing-function: ease-out;
+	-ms-transition-timing-function: ease-out;
+	-o-transition-timing-function: ease-out;
+	transition-timing-function: ease-out;
+	margin: 0 auto;
+}
+.swiper-slide {
+	float: left;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+/* IE10 Windows Phone 8 Fixes */
+.swiper-wp8-horizontal {
+	-ms-touch-action: pan-y;
+}
+.swiper-wp8-vertical {
+	-ms-touch-action: pan-x;
+}
+
+/* ===============================================================
+Your custom styles, here you need to specify container's and slide's
+sizes, pagination, etc.
+================================================================*/
+.swiper-container {
+	/* Specify Swiper's Size: */
+
+	/*width:200px;
+	height: 100px;*/
+}
+.swiper-slide {
+	/* Specify Slides's Size: */
+	
+	/*width: 100%;
+	height: 100%;*/
+}
+.swiper-slide-active {
+	/* Specific active slide styling: */
+	
+}
+.swiper-slide-visible {
+	/* Specific visible slide styling: */	
+
+}
+/* ===============================================================
+Pagination Styles
+================================================================*/
+.swiper-pagination-switch {
+	/* Stylize pagination button: */	
+
+}
+.swiper-active-switch {
+	/* Specific active button style: */	
+	
+}
+.swiper-visible-switch {
+	/* Specific visible button style: */	
+	
+}
--- a/layouts/xedition/css/layout.css
+++ b/layouts/xedition/css/layout.css
--- a/layouts/xedition/css/layout.min.css
+++ b/layouts/xedition/css/layout.min.css
--- a/layouts/xedition/css/webfont.css
+++ b/layouts/xedition/css/webfont.css
--- a/layouts/xedition/css/welcome.css
+++ b/layouts/xedition/css/welcome.css
@ -1,78 +1,503 @@
@charset "utf-8";

-.welcomeXE{padding-top:50px;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif}
-.content + .welcomeXE { padding-top: 0;}
-.welcomeXE section{width:1200px;margin:0 auto}
-.welcomeXE .tit{padding-bottom:32px;font-size:40px;color:#333;font-weight:700;letter-spacing:1px;line-height:50px}
-.welcomeXE .noti{display:block;padding:28px 0 0;margin:0 0 12px;font-size:14px;font-weight:bold;color:#cda25a;letter-spacing:1px;line-height:20px}
-.welcomeXE .intro{width:408px;height:600px;padding-right:792px;background:url(../img/intro.png) 100% 100% no-repeat}
-.welcomeXE .intro .cont{padding-bottom:37px;font-size:15px;font-weight:400;color:#888;line-height:27px}
-.welcomeXE .intro .btn_start{display:inline-block;margin:50px 0;padding:0 27px;height:40px;border:2px solid #cda25a;background-color:#fff;font-size:13px;line-height:40px;letter-spacing:1px;color:#cda25a;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
+.welcomeXE {
+    padding-top: 50px;
+    font-family: Raleway, '나눔바른고딕', NanumBarunGothic, ng, '맑은 고딕', 'Malgun Gothic', '돋움', Dotum, '애플 SD 산돌고딕 Neo', 'Apple SD Gothic Neo', AppleGothic, Helvetica, sans-serif
+}
+.content + .welcomeXE {
+    padding-top: 0;
+}
+.welcomeXE section {
+    width: 1200px;
+    margin: 0 auto
+}
+.welcomeXE .tit {
+    padding-bottom: 32px;
+    font-size: 40px;
+    color: #333;
+    font-weight: 700;
+    letter-spacing: 1px;
+    line-height: 50px
+}
+.welcomeXE .noti {
+    display: block;
+    padding: 28px 0 0;
+    margin: 0 0 12px;
+    font-size: 14px;
+    font-weight: bold;
+    color: #cda25a;
+    letter-spacing: 1px;
+    line-height: 20px
+}
+.welcomeXE .intro {
+    width: 408px;
+    height: 600px;
+    padding-right: 792px;
+    background: url(../img/intro.png) 100% 100% no-repeat
+}
+.welcomeXE .intro .cont {
+    padding-bottom: 37px;
+    font-size: 15px;
+    font-weight: 400;
+    color: #888;
+    line-height: 27px
+}
+.welcomeXE .intro .btn_start {
+    display: inline-block;
+    margin: 50px 0;
+    padding: 0 27px;
+    height: 40px;
+    border: 2px solid #cda25a;
+    background-color: #fff;
+    font-size: 13px;
+    line-height: 40px;
+    letter-spacing: 1px;
+    color: #cda25a;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out
+}
 .welcomeXE .intro .btn_start:hover,
 .welcomeXE .intro .btn_start:active
-.welcomeXE .intro .btn_start:focus{background-color:#cda25a;color:#fff}
-
+.welcomeXE .intro .btn_start:focus {
+    background-color: #cda25a;
+    color: #fff
+}
+.bg-holder {
+    background-image: url('../img/bg_stat.jpg');
+}
 /* section.xeicon */
-.welcomeXE .xeicon{overflow:hidden;position:static;width:100%;margin:0;height:500px;background-image:url(../img/bg_stat.jpg);background-position:50% 0;background-attachment:fixed;background-repeat:no-repeat}
-.welcomeXE .xeicon h1 {margin-top: 170px; font-size: 40px; color: #f6f6f6; text-align: center; letter-spacing: 3px; font-weight: 400; line-height: 1.2em; text-transform: uppercase; }
-.welcomeXE .xeicon h1 a {color: #FFF; }
-.welcomeXE .xeicon .button-area {text-align: center; }
-.welcomeXE .xeicon .button-area .btn_item {font-size: 14px; letter-spacing: 2px;}
-
+.welcomeXE .xeicon {
+    overflow: hidden;
+    position: static;
+    width: 100%;
+    margin: 0;
+    height: 100%;
+}
+.welcomeXE .xeicon h1 {
+    margin-top: 170px;
+    font-size: 40px;
+    color: #f6f6f6;
+    text-align: center;
+    letter-spacing: 3px;
+    font-weight: 400;
+    line-height: 1.2em;
+    text-transform: uppercase;
+}
+.welcomeXE .xeicon h1 a {
+    color: #FFF;
+}
+.welcomeXE .xeicon .button-area {
+    text-align: center;
+    margin-bottom: 140px;
+}
+.welcomeXE .xeicon .button-area .btn_item {
+    font-size: 14px;
+    letter-spacing: 2px;
+}
 /* section.guide */
-.welcomeXE .guide{height:640px;padding-top:80px}
-.welcomeXE .guide ul{padding-top:27px}
-.welcomeXE .guide li{position:relative;float:left;width:314px;min-height:140px;padding:0 0 0 70px;margin:0 0 30px 0}
-.welcomeXE .guide h2{padding:7px 24px 13px 0;font-size:17px;font-weight:normal;line-height:23px;color:#333}
-.welcomeXE .guide p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}
-.welcomeXE .guide .ico{position:absolute;top:0;left:0;width:48px;height:48px;border-radius:100%;background-color:#555;font-size:22px;text-align:center;line-height:50px;color:#efefef}
+.welcomeXE .guide {
+    height: 640px;
+    padding-top: 80px
+}
+.welcomeXE .guide ul {
+    padding-top: 27px
+}
+.welcomeXE .guide li {
+    position: relative;
+    float: left;
+    width: 314px;
+    min-height: 140px;
+    padding: 0 0 0 70px;
+    margin: 0 0 30px 0
+}
+.welcomeXE .guide h2 {
+    padding: 7px 24px 13px 0;
+    font-size: 17px;
+    font-weight: normal;
+    line-height: 23px;
+    color: #333
+}
+.welcomeXE .guide p {
+    padding: 0 24px 0 0;
+    font-size: 14px;
+    line-height: 26px;
+    color: #888
+}
+.welcomeXE .guide .ico {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 48px;
+    height: 48px;
+    border-radius: 100%;
+    background-color: #555;
+    font-size: 22px;
+    text-align: center;
+    line-height: 50px;
+    color: #efefef
+}
 .welcomeXE .guide .ico:hover,
 .welcomeXE .guide .ico:active,
-.welcomeXE .guide .ico:focus{background-color:#cda25a}
-.welcomeXE .guide p a{color:#444}
+.welcomeXE .guide .ico:focus {
+    background-color: #cda25a
+}
+.welcomeXE .guide p a {
+    color: #444
+}
 .welcomeXE .guide p a:hover,
 .welcomeXE .guide p a:active,
-.welcomeXE .guide p a:focus{color:#cda25a;border-bottom:1px solid #cda25a}
-
+.welcomeXE .guide p a:focus {
+    color: #cda25a;
+    border-bottom: 1px solid #cda25a
+}
 /* section.features */
-.welcomeXE .features{width:100%;margin:0;height:800px;padding-top:80px;background-color:#444}
+.welcomeXE .features {
+    width: 100%;
+    margin: 0;
+    height: 800px;
+    padding-top: 80px;
+    background-color: #444
+}
 .welcomeXE .features .noti,
 .welcomeXE .features .tit,
-.welcomeXE .features .cont{width:1200px;margin-left:auto;margin-right:auto}
-.welcomeXE .features .tit{color:#f6f6f6}
-.welcomeXE .features .cont{font-size:15px;line-height:27px;color:#ddd}
-.welcomeXE .features ul{overflow:hidden;margin-top:38px;padding:0 20px}
-.welcomeXE .features li{float:left;width:25%;height:480px}
-.welcomeXE .features li .fe_box{height:478px;margin:0 10px;padding:0 20px;border:1px solid #333;background-color:#f6f6f6;text-align:center;-webkit-transition: all .2s ease-out;-moz-transition: all .2s ease-out;-o-transition: all .2s ease-out;transition: all .2s ease-out}
-.welcomeXE .features .fe_box .ico{display:inline-block;width:70px;height:70px;margin:162px 0 27px;background-color:#cda25a;background:url(../img/sp_feature.png) 0 0 no-repeat;text-align:center;font-size:60px;line-height:70px}
-.welcomeXE .features .fe_box h2{font-size:21px;color:#555;font-weight:normal}
-.welcomeXE .features .fe_box p{margin-bottom:80px;font-size:15px;line-height:24px;color:#f6f6f6}
-.welcomeXE .features .fe_box a{display:inline-block;height:40px;padding:0 40px;border:2px solid #f6f6f6;font-family:'Open Sans',sans-serif;font-size:13px;letter-spacing:1px;color:#f6f6f6;line-height:40px;font-weight:600;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
-.welcomeXE .features .fe_box a:hover{background-color:#f6f6f6;border-color:#f6f6f6;color:#cda25a}
-.welcomeXE .features .fe_top{position:relative;top:0;-webkit-transition: all .2s ease-out;-moz-transition: all .2s ease-out;-o-transition: all .2s ease-out;transition: all .2s ease-out}
-.welcomeXE .features .fe_bottom{position:relative;top:192px;-webkit-transition: all .3s ease-out;-moz-transition: all .3s ease-out;-o-transition: all .3s ease-out;transition: all .3s ease-out}
-.welcomeXE .features .fe_box.on{background-color:#cda25a}
-.welcomeXE .features .fe_box.on .fe_top{top:-104px}
-.welcomeXE .features .fe_box.on .fe_bottom{top:-67px}
-.welcomeXE .features .fe_box.on h2{color:#f6f6f6}
-.welcomeXE .features .fe_box.on .ico{background-color:#f6f6f6;background:url(../img/sp_feature.png) 0 -70px no-repeat}
-.welcomeXE .features .fe_box .ico2{background-position:-70px 0}
-.welcomeXE .features .fe_box .ico3{background-position:-140px 0}
-.welcomeXE .features .fe_box .ico4{background-position:-210px 0}
-.welcomeXE .features .fe_box.on .ico2{background-position:-70px -70px}
-.welcomeXE .features .fe_box.on .ico3{background-position:-140px -70px}
-.welcomeXE .features .fe_box.on .ico4{background-position:-210px -70px}
-
-
+.welcomeXE .features .cont {
+    width: 1200px;
+    margin-left: auto;
+    margin-right: auto
+}
+.welcomeXE .features .tit {
+    color: #f6f6f6
+}
+.welcomeXE .features .cont {
+    font-size: 15px;
+    line-height: 27px;
+    color: #ddd
+}
+.welcomeXE .features ul {
+    overflow: hidden;
+    margin-top: 38px;
+    padding: 0 20px
+}
+.welcomeXE .features li {
+    float: left;
+    width: 25%;
+    height: 480px
+}
+.welcomeXE .features li .fe_box {
+    height: 478px;
+    margin: 0 10px;
+    padding: 0 20px;
+    border: 1px solid #333;
+    background-color: #f6f6f6;
+    text-align: center;
+    -webkit-transition: all .2s ease-out;
+    -moz-transition: all .2s ease-out;
+    -o-transition: all .2s ease-out;
+    transition: all .2s ease-out
+}
+.welcomeXE .features .fe_box .ico {
+    display: inline-block;
+    width: 70px;
+    height: 70px;
+    margin: 162px 0 27px;
+    background-color: #cda25a;
+    background: url(../img/sp_feature.png) 0 0 no-repeat;
+    text-align: center;
+    font-size: 60px;
+    line-height: 70px
+}
+.welcomeXE .features .fe_box h2 {
+    font-size: 21px;
+    color: #555;
+    font-weight: normal
+}
+.welcomeXE .features .fe_box p {
+    margin-bottom: 80px;
+    font-size: 15px;
+    line-height: 24px;
+    color: #f6f6f6
+}
+.welcomeXE .features .fe_box a {
+    display: inline-block;
+    height: 40px;
+    padding: 0 40px;
+    border: 2px solid #f6f6f6;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 13px;
+    letter-spacing: 1px;
+    color: #f6f6f6;
+    line-height: 40px;
+    font-weight: 600;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out
+}
+.welcomeXE .features .fe_box a:hover {
+    background-color: #f6f6f6;
+    border-color: #f6f6f6;
+    color: #cda25a
+}
+.welcomeXE .features .fe_top {
+    position: relative;
+    top: 0;
+    -webkit-transition: all .2s ease-out;
+    -moz-transition: all .2s ease-out;
+    -o-transition: all .2s ease-out;
+    transition: all .2s ease-out
+}
+.welcomeXE .features .fe_bottom {
+    position: relative;
+    top: 192px;
+    -webkit-transition: all .3s ease-out;
+    -moz-transition: all .3s ease-out;
+    -o-transition: all .3s ease-out;
+    transition: all .3s ease-out
+}
+.welcomeXE .features .fe_box.on {
+    background-color: #cda25a
+}
+.welcomeXE .features .fe_box.on .fe_top {
+    top: -104px
+}
+.welcomeXE .features .fe_box.on .fe_bottom {
+    top: -67px
+}
+.welcomeXE .features .fe_box.on h2 {
+    color: #f6f6f6
+}
+.welcomeXE .features .fe_box.on .ico {
+    background-color: #f6f6f6;
+    background: url(../img/sp_feature.png) 0 -70px no-repeat
+}
+.welcomeXE .features .fe_box .ico2 {
+    background-position: -70px 0
+}
+.welcomeXE .features .fe_box .ico3 {
+    background-position: -140px 0
+}
+.welcomeXE .features .fe_box .ico4 {
+    background-position: -210px 0
+}
+.welcomeXE .features .fe_box.on .ico2 {
+    background-position: -70px -70px
+}
+.welcomeXE .features .fe_box.on .ico3 {
+    background-position: -140px -70px
+}
+.welcomeXE .features .fe_box.on .ico4 {
+    background-position: -210px -70px
+}
 /*section.connect*/
-.welcomeXE .connect{height:344px;padding-top:80px}
-.welcomeXE .connect ul{overflow:hidden;padding:40px 0}
-.welcomeXE .connect li{position:relative;float:left;width:180px;margin-left:24px;padding:4px 0 0 102px;min-height:78px}
-.welcomeXE .connect li:first-child{margin-left:0}
-.welcomeXE .connect .ico{position:absolute;top:0;left:0;width:78px;height:78px;border-radius:100%;background-color:#cda25a;text-align:center;font-size:40px;color:#fff}
+.welcomeXE .connect {
+    height: 344px;
+    padding-top: 80px
+}
+.welcomeXE .connect ul {
+    overflow: hidden;
+    padding: 40px 0
+}
+.welcomeXE .connect li {
+    position: relative;
+    float: left;
+    width: 180px;
+    margin-left: 24px;
+    padding: 4px 0 0 102px;
+    min-height: 78px
+}
+.welcomeXE .connect li:first-child {
+    margin-left: 0
+}
+.welcomeXE .connect .ico {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 78px;
+    height: 78px;
+    border-radius: 100%;
+    background-color: #cda25a;
+    text-align: center;
+    font-size: 40px;
+    color: #fff
+}
 .welcomeXE .connect .ico:hover,
 .welcomeXE .connect .ico:active,
-.welcomeXE .connect .ico:focus{background-color:#555}
-.welcomeXE .connect .ico i{line-height:78px}
-.welcomeXE .connect h2{margin-bottom:16px;font-size:15px;font-weight:600;letter-spacing:1px;line-height:18px;color:#333}
-.welcomeXE .connect p{font-size:13px;color:#888;line-height:21px}
+.welcomeXE .connect .ico:focus {
+    background-color: #555
+}
+.welcomeXE .connect .ico i {
+    line-height: 78px
+}
+.welcomeXE .connect h2 {
+    margin-bottom: 16px;
+    font-size: 15px;
+    font-weight: 600;
+    letter-spacing: 1px;
+    line-height: 18px;
+    color: #333
+}
+.welcomeXE .connect p {
+    font-size: 13px;
+    color: #888;
+    line-height: 21px
+}
+@media all and (max-width: 479px) {
+    .welcomeXE {
+        padding-top: 0
+    }
+    .welcomeXE section {
+        width: 100%;
+        box-sizing: border-box;
+        overflow: hidden;
+    }
+    .welcomeXE .tit {
+        padding-bottom: 16px;
+        font-size: 30px;
+        color: #333;
+        font-weight: 700;
+        letter-spacing: 1px;
+        line-height: 40px
+    }
+    .welcomeXE .intro {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 0 14px;
+        height: auto;
+        background: #fff;
+    }
+    .welcomeXE .intro .cont {
+        padding-bottom: 17px;
+    }
+    .welcomeXE .intro .btn_start {
+        margin: 20px 0 50px 0;
+    }
+    .welcomeXE .xeicon {
+        height: auto;
+    }
+    .welcomeXE .xeicon h1 {
+        margin-top: 70px;
+    }
+    .welcomeXE .xeicon .button-area {
+        margin-bottom: 50px;
+    }
+    .welcomeXE .xeicon .button-area .btn_item {
+        font-size: 14px;
+        letter-spacing: 2px;
+        margin: 20px 0;
+    }
+    .welcomeXE .xeicon {
+        background-position: 0 0;
+        background-attachment: inherit;
+    }
+    .welcomeXE .guide {
+        padding: 0 14px;
+        height: auto;
+        padding-top: 40px
+    }
+    .welcomeXE .guide li {
+        width: auto;
+        margin: 0 0 20px 0;
+    }
+    .welcomeXE .features {
+        padding: 40px 14px 0 14px;
+        height: auto;
+    }
+    .welcomeXE .features .noti,
+    .welcomeXE .features .tit,
+    .welcomeXE .features .cont {
+        width: 100%;
+        margin-left: auto;
+        margin-right: auto
+    }
+    .welcomeXE .features ul {
+        padding: 0;
+    }
+    .welcomeXE .features li {
+        clear: both;
+        width: 100%;
+        height: auto;
+        margin: 0 0 20px 0;
+    }
+    .welcomeXE .features li .fe_box {
+        margin: 0;
+        padding: 20px;
+        border: 1px solid #333;
+        background-color: #cda25a;
+        position: relative;
+        height: auto;
+        text-align: left;
+    }
+    .welcomeXE .features .fe_box .ico {
+        display: inline-block;
+        width: 70px;
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 70px;
+        margin: 0;
+        background-color: #f6f6f6;
+        background: url(../img/sp_feature.png) 0 -70px no-repeat;
+        text-align: center;
+        font-size: 20px;
+        line-height: 70px;
+        text-align: left;
+    }
+    .welcomeXE .features .fe_box h2 {
+        color: #f6f6f6;
+        font-weight: normal;
+        padding-left: 80px
+    }
+    .welcomeXE .features .fe_box a {
+        height: 30px;
+        padding: 0 20px;
+        line-height: 30px;
+        float: right;
+    }
+    .welcomeXE .features .fe_bottom {
+        padding-left: 80px;
+        overflow: hidden;
+        position: static;
+    }
+    .welcomeXE .features .fe_box p {
+        margin-bottom: 40px;
+        margin-top: 10px;
+        font-size: 13px;
+        line-height: 20px;
+    }
+    .welcomeXE .features .fe_box .ico2 {
+        background-position: -70px -70px
+    }
+    .welcomeXE .features .fe_box .ico3 {
+        background-position: -140px -70px
+    }
+    .welcomeXE .features .fe_box .ico4 {
+        background-position: -210px -70px
+    }
+    .welcomeXE .features .fe_box.on .fe_top {
+        top: 0
+    }
+    .welcomeXE .features .fe_box.on .fe_bottom {
+        top: 0
+    }
+    .welcomeXE .connect {
+        height: auto;
+        padding: 80px 14px 0 14px;
+    }
+    .welcomeXE .connect ul {
+        padding-top: 0;
+    }
+    .welcomeXE .connect li {
+        margin-left: 0;
+        width: auto;
+        min-height: 78px;
+        margin-bottom: 20px;
+    }
+
+}
+
+
+
--- a/layouts/xedition/css/welcome.min.css
+++ b/layouts/xedition/css/welcome.min.css
--- a/layouts/xedition/css/widget.login.css
+++ b/layouts/xedition/css/widget.login.css
@ -1,208 +1,535 @@
@charset "utf-8";

-.login_widget{position:fixed;top:0;left:0;z-index:999999;width:100%;height:100%;font-family:'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;font-weight:400}
-.login_widget .btn_ly_popup{position:absolute;top:-41px;right:0;width:32px;height:32px;background:url(../img/btn_close.png) 0 0 no-repeat}
-.login_widget .blind{overflow:hidden;position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0}
-.login_widget .ly_dimmed{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=70);opacity:.7}
-.login_widget .signin{position:absolute;top:50%;margin-top:-224px;left:50%;width:380px;margin-left:-190px;background-color:#fff}
-.login_widget .signin>.login-header{padding:30px}
-.login_widget .signin>.login-header>h1{font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,AppleGothic,Helvetica,sans-serif;font-size:40px;line-height:50px;font-weight:400;color:#444}
-.login_widget .signin>.login-body{padding:0 30px}
-.login_widget .signin>.login-footer{padding:23px 0 42px;margin:20px 30px 0;text-align:center;color:#aaa}
-.login_widget .signin>.login-footer>a{text-decoration:none;font-size:13px;color:#aaa}
-.login_widget .signin>.login-footer>a:hover,
-.login_widget .signin>.login-footer>a:active,
-.login_widget .signin>.login-footer>a:focus{text-decoration:underline}
-.login_widget .signin>.login-footer>.f_bar{display:inline-block;margin:0 3px}
-.login_widget .signin .control-group{position:relative;padding:0;margin:0;clear:both}
-.login_widget .signin .control-group:before{content:"";display:block;clear:both}
-.login_widget .signin form{margin:0}
-.login_widget .signin fieldset{margin:0}
-.login_widget .signin .chk_label{cursor:pointer;display:inline-block;margin:4px 0 0;color:#999;line-height:20px;font-size:13px}
+.login_widget {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999999;
+    width: 100%;
+    height: 100%;
+    font-family: '나눔바른고딕', NanumBarunGothic, ng, '맑은 고딕', 'Malgun Gothic', '돋움', Dotum, '애플 SD 산돌고딕 Neo', 'Apple SD Gothic Neo', AppleGothic, Helvetica, sans-serif;
+    font-weight: 400
+}
+.login_widget .btn_ly_popup {
+    position: absolute;
+    top: -41px;
+    right: 0;
+    width: 32px;
+    height: 32px;
+    background: url(../img/btn_close.png) 0 0 no-repeat
+}
+.login_widget .blind {
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 1px;
+    height: 1px;
+    font-size: 0;
+    line-height: 0
+}
+.login_widget .ly_dimmed {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    filter: alpha(opacity=70);
+    opacity: .7
+}
+.login_widget .signin {
+    position: absolute;
+    top: 50%;
+    margin-top: -224px;
+    left: 50%;
+    width: 380px;
+    margin-left: -190px;
+    background-color: #fff
+}
+.login_widget .signin > .login-header {
+    padding: 30px
+}
+.login_widget .signin > .login-header > h1 {
+    font-family: Raleway, '나눔바른고딕', NanumBarunGothic, ng, AppleGothic, Helvetica, sans-serif;
+    font-size: 40px;
+    line-height: 50px;
+    font-weight: 400;
+    color: #444
+}
+.login_widget .signin > .login-body {
+    padding: 0 30px
+}
+.login_widget .signin > .login-footer {
+    padding: 23px 0 42px;
+    margin: 20px 30px 0;
+    text-align: center;
+    color: #aaa
+}
+.login_widget .signin > .login-footer > a {
+    text-decoration: none;
+    font-size: 13px;
+    color: #aaa
+}
+.login_widget .signin > .login-footer > a:hover,
+.login_widget .signin > .login-footer > a:active,
+.login_widget .signin > .login-footer > a:focus {
+    text-decoration: underline
+}
+.login_widget .signin > .login-footer > .f_bar {
+    display: inline-block;
+    margin: 0 3px
+}
+.login_widget .signin .control-group {
+    position: relative;
+    padding: 0;
+    margin: 0;
+    clear: both
+}
+.login_widget .signin .control-group:before {
+    content: "";
+    display: block;
+    clear: both
+}
+.login_widget .signin form {
+    margin: 0
+}
+.login_widget .signin fieldset {
+    margin: 0
+}
+.login_widget .signin .chk_label {
+    cursor: pointer;
+    display: inline-block;
+    margin: 4px 0 0;
+    color: #999;
+    line-height: 20px;
+    font-size: 13px
+}
 .login_widget .signin input[type="text"],
 .login_widget .signin input[type="email"],
-.login_widget .signin input[type="password"]{font-size:16px;width:100%;height:28px;padding:0 6px 3px 1px;border:0;border-bottom:1px solid #aaa;background-color:#fff;line-height:20px;color:#444;box-sizing:border-box}
-.login_widget .signin .btn_submit{position:relative;font-size:16px;color:#eee;background-color:#444;width:100%;margin:20px 0 0;padding:18px 0px 19px;border:0;cursor:pointer}
+.login_widget .signin input[type="password"] {
+    font-size: 16px;
+    width: 100%;
+    height: 28px;
+    padding: 0 6px 3px 1px;
+    border: 0;
+    border-bottom: 1px solid #aaa;
+    background-color: #fff;
+    line-height: 20px;
+    color: #444;
+    box-sizing: border-box
+}
+.login_widget .signin .btn_submit {
+    position: relative;
+    font-size: 16px;
+    color: #eee;
+    background-color: #444;
+    width: 100%;
+    margin: 20px 0 0;
+    padding: 18px 0px 19px;
+    border: 0;
+    cursor: pointer
+}
 .login_widget .signin .btn_submit:hover,
-.login_widget .signin .btn_submit:active{background-color:#333}
+.login_widget .signin .btn_submit:active {
+    background-color: #333
+}
 .login_widget .signin input[type="email"]:focus,
 .login_widget .signin input[type="password"]:focus,
-.login_widget .signin input[type="text"]:focus{outline:none}
-.login_widget .signin .error{margin:2px 0 19px;background:none;color:#fc0005;font-size:13px}
-.login_widget .signin #warning{display:none;position:absolute;top:44px;left:0;z-index:100;padding:11px 15px;background-color:#444}
-.login_widget .signin #warning>p{color:#fff;font-size:13px;font-weight:300;line-height:19px}
-.login_widget .signin #warning .edge{position:absolute;top:-7px;left:40px;width:0;height:0;border-width:0 8px 8px;border-style:solid;border-color:transparent transparent #444}
-.login_widget .group{position:relative;padding:21px 0 0}
-.login_widget .info_label{color: #999; font-size: 16px;position: absolute;pointer-events: none;left: 1px;top:23px;-webkit-transition:all 0.2s ease;transition:all 0.2s ease}
-.login_widget .group{margin-bottom:20px}
+.login_widget .signin input[type="text"]:focus {
+    outline: none
+}
+.login_widget .signin .error {
+    margin: 2px 0 19px;
+    background: none;
+    color: #fc0005;
+    font-size: 13px
+}
+.login_widget .signin #warning {
+    display: none;
+    position: absolute;
+    top: 44px;
+    left: 0;
+    z-index: 100;
+    padding: 11px 15px;
+    background-color: #444
+}
+.login_widget .signin #warning > p {
+    color: #fff;
+    font-size: 13px;
+    font-weight: 300;
+    line-height: 19px
+}
+.login_widget .signin #warning .edge {
+    position: absolute;
+    top: -7px;
+    left: 40px;
+    width: 0;
+    height: 0;
+    border-width: 0 8px 8px;
+    border-style: solid;
+    border-color: transparent transparent #444
+}
+.login_widget .group {
+    position: relative;
+    padding: 21px 0 0
+}
+.login_widget .info_label {
+    color: #999;
+    font-size: 16px;
+    position: absolute;
+    pointer-events: none;
+    left: 1px;
+    top: 23px;
+    -webkit-transition: all 0.2s ease;
+    transition: all 0.2s ease
+}
+.login_widget .group {
+    margin-bottom: 20px
+}
 .login_widget input:focus ~ .info_label,
-.login_widget input.used ~ .info_label{top:1px;font-size:13px;color:#cda25a}
-.login_widget .bar{position:relative;display:block;width:100%}
+.login_widget input.used ~ .info_label {
+    top: 1px;
+    font-size: 13px;
+    color: #cda25a
+}
+.login_widget .bar {
+    position: relative;
+    display: block;
+    width: 100%
+}
 .login_widget .bar:before,
-.login_widget .bar:after{height:2px;width:0;bottom:0;position:absolute;background:#cda25a;-webkit-transition:all 0.2s ease;transition:all 0.2s ease;content:''}
-.login_widget .bar:before{left:50%}
-.login_widget .bar:after{right:50%}
+.login_widget .bar:after {
+    height: 2px;
+    width: 0;
+    bottom: 0;
+    position: absolute;
+    background: #cda25a;
+    -webkit-transition: all 0.2s ease;
+    transition: all 0.2s ease;
+    content: ''
+}
+.login_widget .bar:before {
+    left: 50%
+}
+.login_widget .bar:after {
+    right: 50%
+}
 .login_widget input:focus ~ .bar:before,
-.login_widget input:focus ~ .bar:after{width:50%}
-.login_widget .highlight {position: absolute;height: 60%; width: 100px; bottom: 1px; left: 0;pointer-events: none;opacity:0.5}
-.login_widget input:focus ~ .highlight{-webkit-animation:inputHighlighter 0.3s ease;animation:inputHighlighter 0.3s ease}
-.login_widget .signin input[type=checkbox]{position:absolute;width:20px;height:20px;opacity:0;opacity:100\9;vertical-align:top}
-.login_widget .signin input[type=checkbox] ~ .checkbox {box-sizing: border-box;display: inline-block;width: 20px;height: 20px;margin:-1px 9px 0 0;border: 1px solid;background-repeat: no-repeat;-webkit-animation-fill-mode: forwards;animation-fill-mode: forwards;-webkit-animation: checkboxOff 0.5s;animation: checkboxOff 0.5s;border-color: #c9c9c9;cursor: pointer;position: relative;vertical-align:middle}
-.login_widget .signin input[type=checkbox] ~ .checkbox:before {content: "";display: block;width: 60px;height: 60px;background: rgba(0, 0, 0, 0.1);position: absolute;top: -22px;left: -22px;z-index: 0;border-radius: 100%;-webkit-transform: scale(0);-ms-transform: scale(0);transform: scale(0);-webkit-animation: checkboxRippleOn 0.5s;animation: checkboxRippleOn 0.5s}
-.login_widget .signin input[type=checkbox] ~ .checkbox:not(:hover) {-webkit-animation: checkboxOff 0s;animation: checkboxOff 0s}
-.login_widget .signin input[type=checkbox] ~ .checkbox:not(:hover):before {-webkit-animation: checkboxRippleOn 0s;animation: checkboxRippleOn 0s}
-.login_widget .signin input[type=checkbox]:checked ~ .checkbox {-webkit-animation-fill-mode: forwards;animation-fill-mode: forwards;-webkit-animation: checkboxOn 0.5s;animation: checkboxOn 0.5s;border-color: #cda25a;background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a); background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 40px 0px}
-.login_widget .signin input[type=checkbox]:checked ~ .checkbox:before {-webkit-animation: checkboxRippleOff 0.5s;animation: checkboxRippleOff 0.5s}
-
+.login_widget input:focus ~ .bar:after {
+    width: 50%
+}
+.login_widget .highlight {
+    position: absolute;
+    height: 60%;
+    width: 100px;
+    bottom: 1px;
+    left: 0;
+    pointer-events: none;
+    opacity: 0.5
+}
+.login_widget input:focus ~ .highlight {
+    -webkit-animation: inputHighlighter 0.3s ease;
+    animation: inputHighlighter 0.3s ease
+}
+.login_widget .signin input[type=checkbox] {
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    opacity: 0;
+    opacity: 100 \9;
+    vertical-align: top
+}
+.login_widget .signin input[type=checkbox] ~ .checkbox {
+    box-sizing: border-box;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    margin: -1px 9px 0 0;
+    border: 1px solid;
+    background-repeat: no-repeat;
+    -webkit-animation-fill-mode: forwards;
+    animation-fill-mode: forwards;
+    -webkit-animation: checkboxOff 0.5s;
+    animation: checkboxOff 0.5s;
+    border-color: #c9c9c9;
+    cursor: pointer;
+    position: relative;
+    vertical-align: middle
+}
+.login_widget .signin input[type=checkbox] ~ .checkbox:before {
+    content: "";
+    display: block;
+    width: 60px;
+    height: 60px;
+    background: rgba(0, 0, 0, 0.1);
+    position: absolute;
+    top: -22px;
+    left: -22px;
+    z-index: 0;
+    border-radius: 100%;
+    -webkit-transform: scale(0);
+    -ms-transform: scale(0);
+    transform: scale(0);
+    -webkit-animation: checkboxRippleOn 0.5s;
+    animation: checkboxRippleOn 0.5s
+}
+.login_widget .signin input[type=checkbox] ~ .checkbox:not(:hover) {
+    -webkit-animation: checkboxOff 0s;
+    animation: checkboxOff 0s
+}
+.login_widget .signin input[type=checkbox] ~ .checkbox:not(:hover):before {
+    -webkit-animation: checkboxRippleOn 0s;
+    animation: checkboxRippleOn 0s
+}
+.login_widget .signin input[type=checkbox]:checked ~ .checkbox {
+    -webkit-animation-fill-mode: forwards;
+    animation-fill-mode: forwards;
+    -webkit-animation: checkboxOn 0.5s;
+    animation: checkboxOn 0.5s;
+    border-color: #cda25a;
+    background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+    background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+    background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 40px 0px
+}
+.login_widget .signin input[type=checkbox]:checked ~ .checkbox:before {
+    -webkit-animation: checkboxRippleOff 0.5s;
+    animation: checkboxRippleOff 0.5s
+}
 /* Animations */
@-webkit-keyframes inputHighlighter {
-	from {background:#cda25a}
-	to {width:0;background:transparent}
+    from {
+        background: #cda25a
+    }
+    to {
+        width: 0;
+        background: transparent
+    }
 }
-
@keyframes inputHighlighter {
-	from {background:#cda25a}
-	to {width:0;background:transparent}
+    from {
+        background: #cda25a
+    }
+    to {
+        width: 0;
+        background: transparent
+    }
 }
-
@-webkit-keyframes ripples {
-	0% {opacity:0}
-	25% {opacity:1}
-	100% {width:200%;padding-bottom:200%;opacity:0}
+    0% {
+        opacity: 0
+    }
+    25% {
+        opacity: 1
+    }
+    100% {
+        width: 200%;
+        padding-bottom: 200%;
+        opacity: 0
+    }
 }
-
@keyframes ripples {
-	0% {opacity:0}
-	25% {opacity:1}
-	100% {width:200%;padding-bottom:200%;opacity:0}
+    0% {
+        opacity: 0
+    }
+    25% {
+        opacity: 1
+    }
+    100% {
+        width: 200%;
+        padding-bottom: 200%;
+        opacity: 0
+    }
 }
-
@-webkit-keyframes checkboxOn {
-	0% {background-color: rgba(204, 162, 86, 0);background-image: none}
-	48% {background-color: #cda25a;background-image: none;}
-	49% {background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a)}
-	50% {
-		background-color: rgba(204, 162, 86, 0);
-		background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
-	}
-	100% {
-		background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 40px 0px;
-	}
+    0% {
+        background-color: rgba(204, 162, 86, 0);
+        background-image: none
+    }
+    48% {
+        background-color: #cda25a;
+        background-image: none;
+    }
+    49% {
+        background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a)
+    }
+    50% {
+        background-color: rgba(204, 162, 86, 0);
+        background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
+    }
+    100% {
+        background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 40px 0px;
+    }
 }
-
@keyframes checkboxOn {
-	0% {background-color: rgba(204, 162, 86, 0);background-image: none}
-	48% {background-color: #cda25a;background-image: none;}
-	49% {background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a)}
-	50% {
-		background-color: rgba(204, 162, 86, 0);
-		background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
-	}
-	100% {
-		background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 40px 0px;
-	}
+    0% {
+        background-color: rgba(204, 162, 86, 0);
+        background-image: none
+    }
+    48% {
+        background-color: #cda25a;
+        background-image: none;
+    }
+    49% {
+        background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a)
+    }
+    50% {
+        background-color: rgba(204, 162, 86, 0);
+        background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
+    }
+    100% {
+        background-image: -webkit-linear-gradient(315deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), -webkit-linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(204, 162, 86, 0) 50%), linear-gradient(45deg, rgba(204, 162, 86, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 40px 0px;
+    }
 }
-
@-webkit-keyframes checkboxOff {
-	0% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, -20px 0px;
-	}
-	74% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		box-shadow: inset 0 0 0 0 #cda25a;
-	}
-	75% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		box-shadow: inset 0 0 0 20px #cda25a;
-	}
-	80% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
-	}
-	81% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
-	}
-	100% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
-		box-shadow: inset 0 0 0 0 #cda25a;
-	}
+    0% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, -20px 0px;
+    }
+    74% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        box-shadow: inset 0 0 0 0 #cda25a;
+    }
+    75% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        box-shadow: inset 0 0 0 20px #cda25a;
+    }
+    80% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
+    }
+    81% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
+    }
+    100% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
+        box-shadow: inset 0 0 0 0 #cda25a;
+    }
 }
-
@keyframes checkboxOff {
-	0% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, -20px 0px;
-	}
-	74% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		box-shadow: inset 0 0 0 0 #cda25a;
-	}
-	75% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		box-shadow: inset 0 0 0 20px #cda25a;
-	}
-	80% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
-	}
-	81% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
-	}
-	100% {
-		background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
-		background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
-		background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
-		box-shadow: inset 0 0 0 0 #cda25a;
-	}
+    0% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, -20px 0px;
+    }
+    74% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        box-shadow: inset 0 0 0 0 #cda25a;
+    }
+    75% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        box-shadow: inset 0 0 0 20px #cda25a;
+    }
+    80% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: 50% 3px, 5px -5px, -11px -5px, -9px 0px, -6px -2px, 0px -12px, 0px 0px;
+    }
+    81% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
+    }
+    100% {
+        background-image: -webkit-linear-gradient(315deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(315deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), -webkit-linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), -webkit-linear-gradient(#cda25a, #cda25a);
+        background-image: linear-gradient(135deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(45deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(135deg, #cda25a 50%, rgba(0, 0, 0, 0) 50%), linear-gradient(45deg, rgba(0, 0, 0, 0) 50%, #cda25a 50%), linear-gradient(#cda25a, #cda25a);
+        background-position: -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px, -100px 0px;
+        box-shadow: inset 0 0 0 0 #cda25a;
+    }
 }
-
@-webkit-keyframes checkboxRippleOn {
-	0% {-webkit-transform: scale(0);transform:scale(0);opacity:1}
-	40% {-webkit-transform: scale(1);transform: scale(1)}
-	50% {opacity:0}
-	100% {-webkit-transform: scale(0);transform: scale(0);opacity:1}
+    0% {
+        -webkit-transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
+    40% {
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+    50% {
+        opacity: 0
+    }
+    100% {
+        -webkit-transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
 }
-
@keyframes checkboxRippleOn {
-	0% {transform: scale(0);transform: scale(0);opacity:1}
-	40% {transform: scale(1);transform: scale(1)}
-	50% {opacity:0}
-	100% {transform: scale(0);transform: scale(0);opacity:1}
+    0% {
+        transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
+    40% {
+        transform: scale(1);
+        transform: scale(1)
+    }
+    50% {
+        opacity: 0
+    }
+    100% {
+        transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
 }
-
@-webkit-keyframes checkboxRippleOff {
-	0% {-webkit-transform: scale(0);transform: scale(0);opacity:1}
-	40% {-webkit-transform: scale(1);transform: scale(1)}
-	50% {opacity:0}
-	100% {-webkit-transform: scale(0);transform: scale(0);opacity:1}
+    0% {
+        -webkit-transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
+    40% {
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+    50% {
+        opacity: 0
+    }
+    100% {
+        -webkit-transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
 }
-
@keyframes checkboxRippleOff {
-	0% {transform: scale(0);transform: scale(0);opacity:1}
-	40% {transform: scale(1);transform: scale(1)}
-	50% {opacity:0}
-	100% {transform: scale(0);transform: scale(0);opacity:1}
+    0% {
+        transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
+    40% {
+        transform: scale(1);
+        transform: scale(1)
+    }
+    50% {
+        opacity: 0
+    }
+    100% {
+        transform: scale(0);
+        transform: scale(0);
+        opacity: 1
+    }
 }
--- a/layouts/xedition/css/widget.login.min.css
+++ b/layouts/xedition/css/widget.login.min.css
--- a/layouts/xedition/css/xeicon.css
+++ b/layouts/xedition/css/xeicon.css
@ -1,54 +1,266 @@
@charset "utf-8";

 /* reset parent style */
-.body.sub {width:100% !important; margin:0;}
-.body.sub.full_width .content {width:100% !important; padding-bottom:0px !important;}
-
+.body.sub {
+    width: 100% !important;
+    margin: 0;
+}
+.body.sub.full_width .content {
+    width: 100% !important;
+    padding-bottom: 0px !important;
+}
 /* XEicon page common style */
-.XEicon { padding-top: 60px;}
-.XEicon .fixedwidth {width:1200px; margin:0 auto;}
-.XEicon .tit {position:relative;}
-.XEicon .tit h1 {font-size:29px; text-align:center; letter-spacing:2px;}
-.XEicon .tit h1:after {position:absolute; top:115%; left:49%; width:20px; height:3px; background-color:#cda25a; content: "";}
-
+.XEicon {
+    padding-top: 60px;
+}
+.XEicon .fixedwidth {
+    width: 1200px;
+    margin: 0 auto;
+}
+.XEicon .tit {
+    position: relative;
+}
+.XEicon .tit h1 {
+    font-size: 29px;
+    text-align: center;
+    letter-spacing: 2px;
+}
+.XEicon .tit h1:after {
+    position: absolute;
+    top: 115%;
+    left: 49%;
+    width: 20px;
+    height: 3px;
+    background-color: #cda25a;
+    content: "";
+}
 /* a tag style */
-.XEicon p a{color:#444}
+.XEicon p a {
+    color: #444
+}
 .XEicon p a:hover,
 .XEicon p a:active,
-.XEicon p a:focus{color:#cda25a;border-bottom:1px solid #cda25a}
-
+.XEicon p a:focus {
+    color: #cda25a;
+    border-bottom: 1px solid #cda25a
+}
 /* section .main_title */
-.XEicon .main_title h1 {margin-bottom: 47px;font-size: 34px;font-weight: 600;color: #cda25a;text-align: center;font-family: Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;text-transform: uppercase;letter-spacing: 1px;}
-.XEicon .main_title p {font-size:15px;line-height:28px;color:#444;text-align:center}
-
+.XEicon .main_title h1 {
+    margin-bottom: 47px;
+    font-size: 34px;
+    font-weight: 600;
+    color: #cda25a;
+    text-align: center;
+    font-family: Raleway, '나눔바른고딕', NanumBarunGothic, ng, '맑은 고딕', 'Malgun Gothic', '돋움', Dotum, '애플 SD 산돌고딕 Neo', 'Apple SD Gothic Neo', AppleGothic, Helvetica, sans-serif;
+    text-transform: uppercase;
+    letter-spacing: 1px;
+}
+.XEicon .main_title p {
+    font-size: 15px;
+    line-height: 28px;
+    color: #444;
+    text-align: center
+}
 /* section .feature */
-.XEicon .feature{height:518px;padding-top:120px;}
-.XEicon .feature ul{padding-top:80px}
-.XEicon .feature li{position:relative;float:left;width:314px;min-height:140px;padding:0 16px 0 70px;margin:0 0 30px 0}
-.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:600;line-height:23px;color:#333}
-.XEicon .feature p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}
-.XEicon .feature .ico{position:absolute;top:0;left:0;width:48px;height:48px;font-size:22px;text-align:center;line-height:50px;color:#555}
-
+.XEicon .feature {
+    height: 518px;
+    padding-top: 120px;
+}
+.XEicon .feature ul {
+    padding-top: 80px
+}
+.XEicon .feature li {
+    position: relative;
+    float: left;
+    width: 314px;
+    min-height: 140px;
+    padding: 0 16px 0 70px;
+    margin: 0 0 30px 0
+}
+.XEicon .feature h2 {
+    padding: 7px 24px 13px 0;
+    font-size: 17px;
+    font-weight: 600;
+    line-height: 23px;
+    color: #333
+}
+.XEicon .feature p {
+    padding: 0 24px 0 0;
+    font-size: 14px;
+    line-height: 26px;
+    color: #888
+}
+.XEicon .feature .ico {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 48px;
+    height: 48px;
+    font-size: 22px;
+    text-align: center;
+    line-height: 50px;
+    color: #555
+}
 /* section .get_started */
-.XEicon .get_started {height:550px; padding-top:80px; background: #f6f6f6; box-sizing:border-box;}
-.XEicon .get_started .cont {font-size:15px; margin-top:75px; color:#888;}
-.XEicon .get_started ul {margin-top:34px;}
-.XEicon .get_started li {position:relative; float:left; width:286px; height:212px; margin-right:15px; border:1px solid #e8e8e8; background:#fff; text-align:center;}
-.XEicon .get_started li:last-child {margin-right:0;}
-.XEicon .get_started li h2 {padding:33px 0 19px; font-size:17px; font-weight: 600}
-.XEicon .get_started li p {padding: 0 37px; font-size:14px; line-height: 26px; color:#888;}
-.XEicon .get_started li > a {position:absolute; display:block; bottom:0; width:100%; height:50px; background:#888; border-top:1px solid #e1e1e1; line-height: 50px; font-size:14px; font-weight:600; text-transform:uppercase; color:#fff; -webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
+.XEicon .get_started {
+    height: 550px;
+    padding-top: 80px;
+    background: #f6f6f6;
+    box-sizing: border-box;
+}
+.XEicon .get_started .cont {
+    font-size: 15px;
+    margin-top: 75px;
+    color: #888;
+}
+.XEicon .get_started ul {
+    margin:34px -16px 0 0;
+}
+.XEicon .get_started li {
+    position: relative;
+    float: left;
+    width: 286px;
+    height: 212px;
+    margin-right: 16px;
+    border: 1px solid #e8e8e8;
+    background: #fff;
+    text-align: center;
+}
+.XEicon .get_started li:last-child {
+    margin-right: 0;
+}
+.XEicon .get_started li h2 {
+    padding: 33px 0 19px;
+    font-size: 17px;
+    font-weight: 600
+}
+.XEicon .get_started li p {
+    padding: 0 37px;
+    font-size: 14px;
+    line-height: 26px;
+    color: #888;
+}
+.XEicon .get_started li > a {
+    position: absolute;
+    display: block;
+    bottom: 0;
+    width: 100%;
+    height: 50px;
+    background: #888;
+    border-top: 1px solid #e1e1e1;
+    line-height: 50px;
+    font-size: 14px;
+    font-weight: 600;
+    text-transform: uppercase;
+    color: #fff;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out
+}
 .XEicon .get_started li > a:hover,
 .XEicon .get_started li > a:active,
-.XEicon .get_started li > a:focus {background-color:#cda25a;color:#fff;}
-
-.XEicon .get_started li > a .xeicon {display: none; margin-right:6px; font-size:140%; vertical-align: middle}
-.XEicon .get_started li > a:hover .xeicon {display: inline-block; margin-top:-4px;}
-
+.XEicon .get_started li > a:focus {
+    background-color: #cda25a;
+    color: #fff;
+}
+.XEicon .get_started li > a .xeicon {
+    display: none;
+    margin-right: 6px;
+    font-size: 140%;
+    vertical-align: middle
+}
+.XEicon .get_started li > a:hover .xeicon {
+    display: inline-block;
+    margin-top: -4px;
+}
 /* section .contribution */
-.XEicon .contribution {height:442px; padding-top:93px; box-sizing:border-box; text-align:center;}
-.XEicon .contribution .cont {font-size:15px;line-height:26px;text-align:center; margin-top:58px; color:#888;}
-.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 40px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:15px;line-height:52px;font-weight: 600;letter-spacing:1px;color:#cda25a;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
+.XEicon .contribution {
+    height: 442px;
+    padding-top: 93px;
+    box-sizing: border-box;
+    text-align: center;
+}
+.XEicon .contribution .cont {
+    font-size: 15px;
+    line-height: 26px;
+    text-align: center;
+    margin-top: 58px;
+    color: #888;
+}
+.XEicon .contribution .btn_github {
+    display: inline-block;
+    margin: 50px 0;
+    padding: 0 40px;
+    height: 52px;
+    border: 2px solid #cda25a;
+    background-color: #fff;
+    font-size: 15px;
+    line-height: 52px;
+    font-weight: 600;
+    letter-spacing: 1px;
+    color: #cda25a;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out
+}
 .XEicon .contribution .btn_github:hover,
 .XEicon .contribution .btn_github:active
-.XEicon .contribution .btn_github:focus{background-color:#cda25a;color:#fff}
+.XEicon .contribution .btn_github:focus {
+    background-color: #cda25a;
+    color: #fff
+}
+@media all and (max-width: 479px) {
+    .XEicon .fixedwidth {
+        width: auto;
+    }
+    .XEicon .main_title h1 {
+        margin-bottom: 28px;
+        font-size: 21px;
+    }
+    .XEicon .main_title p {
+        padding: 0 14px;
+        text-align: left;
+    }
+    .XEicon .tit h1 {
+        font-size: 20px;
+        text-align: center;
+        letter-spacing: 2px;
+    }
+    .XEicon .tit h1:after {
+        left: 50%;
+        margin-left: -10px;
+    }
+    .XEicon .feature {
+        height: auto;
+        padding-top: 90px;
+    }
+    .XEicon .feature ul {
+        padding: 50px 14px 0 14px;
+    }
+    .XEicon .feature li {
+        clear: both;
+        width: auto;
+        padding: 0 0 0 70px;
+    }
+    .XEicon .feature h2 {
+	    padding-top:10px;
+    }
+    .XEicon .get_started {
+        height: auto;
+        padding: 80px 14px 20px 14px;
+    }
+    .XEicon .get_started li {
+        float: none;
+        width: auto;
+        margin-right: 0;
+        margin-bottom: 15px;
+    }
+    .XEicon .contribution .cont {
+        padding: 0 14px;
+        text-align: left;
+    }
+} 
--- a/layouts/xedition/css/xeicon.min.css
+++ b/layouts/xedition/css/xeicon.min.css
@ -1 +1 @@
-@charset "utf-8";.body.sub{width:100%!important;margin:0}.body.sub.full_width .content{width:100%!important;padding-bottom:0!important}.XEicon{padding-top:60px}.XEicon .fixedwidth{width:1200px;margin:0 auto}.XEicon .tit{position:relative}.XEicon .tit h1{font-size:29px;text-align:center;letter-spacing:2px}.XEicon .tit h1:after{position:absolute;top:115%;left:49%;width:20px;height:3px;background-color:#cda25a;content:""}.XEicon p a{color:#444}.XEicon p a:active,.XEicon p a:focus,.XEicon p a:hover{color:#cda25a;border-bottom:1px solid #cda25a}.XEicon .main_title h1{margin-bottom:47px;font-size:34px;font-weight:600;color:#cda25a;text-align:center;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;text-transform:uppercase;letter-spacing:1px}.XEicon .main_title p{font-size:15px;line-height:28px;color:#444;text-align:center}.XEicon .feature{height:518px;padding-top:120px}.XEicon .feature ul{padding-top:80px}.XEicon .feature li{position:relative;float:left;width:314px;min-height:140px;padding:0 16px 0 70px;margin:0 0 30px}.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:600;line-height:23px;color:#333}.XEicon .feature p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}.XEicon .feature .ico{position:absolute;top:0;left:0;width:48px;height:48px;font-size:22px;text-align:center;line-height:50px;color:#555}.XEicon .get_started{height:550px;padding-top:80px;background:#f6f6f6;box-sizing:border-box}.XEicon .get_started .cont{font-size:15px;margin-top:75px;color:#888}.XEicon .get_started ul{margin-top:34px}.XEicon .get_started li{position:relative;float:left;width:286px;height:212px;margin-right:15px;border:1px solid #e8e8e8;background:#fff;text-align:center}.XEicon .get_started li:last-child{margin-right:0}.XEicon .get_started li h2{padding:33px 0 19px;font-size:17px;font-weight:600}.XEicon .get_started li p{padding:0 37px;font-size:14px;line-height:26px;color:#888}.XEicon .get_started li>a{position:absolute;display:block;bottom:0;width:100%;height:50px;background:#888;border-top:1px solid #e1e1e1;line-height:50px;font-size:14px;font-weight:600;text-transform:uppercase;color:#fff;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .get_started li>a:active,.XEicon .get_started li>a:focus,.XEicon .get_started li>a:hover{background-color:#cda25a;color:#fff}.XEicon .get_started li>a .xeicon{display:none;margin-right:6px;font-size:140%;vertical-align:middle}.XEicon .get_started li>a:hover .xeicon{display:inline-block;margin-top:-4px}.XEicon .contribution{height:442px;padding-top:93px;box-sizing:border-box;text-align:center}.XEicon .contribution .cont{font-size:15px;line-height:26px;text-align:center;margin-top:58px;color:#888}.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 40px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:15px;line-height:52px;font-weight:600;letter-spacing:1px;color:#cda25a;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .contribution .btn_github:active .XEicon .contribution .btn_github:focus,.XEicon .contribution .btn_github:hover{background-color:#cda25a;color:#fff}
+@charset "utf-8";.body.sub{width:100%!important;margin:0}.body.sub.full_width .content{width:100%!important;padding-bottom:0!important}.XEicon{padding-top:60px}.XEicon .fixedwidth{width:1200px;margin:0 auto}.XEicon .tit{position:relative}.XEicon .tit h1{font-size:29px;text-align:center;letter-spacing:2px}.XEicon .tit h1:after{position:absolute;top:115%;left:49%;width:20px;height:3px;background-color:#cda25a;content:""}.XEicon p a{color:#444}.XEicon p a:active,.XEicon p a:focus,.XEicon p a:hover{color:#cda25a;border-bottom:1px solid #cda25a}.XEicon .main_title h1{margin-bottom:47px;font-size:34px;font-weight:600;color:#cda25a;text-align:center;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;text-transform:uppercase;letter-spacing:1px}.XEicon .main_title p{font-size:15px;line-height:28px;color:#444;text-align:center}.XEicon .feature{height:518px;padding-top:120px}.XEicon .feature ul{padding-top:80px}.XEicon .feature li{position:relative;float:left;width:314px;min-height:140px;padding:0 16px 0 70px;margin:0 0 30px}.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:600;line-height:23px;color:#333}.XEicon .feature p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}.XEicon .feature .ico{position:absolute;top:0;left:0;width:48px;height:48px;font-size:22px;text-align:center;line-height:50px;color:#555}.XEicon .get_started{height:550px;padding-top:80px;background:#f6f6f6;box-sizing:border-box}.XEicon .get_started .cont{font-size:15px;margin-top:75px;color:#888}.XEicon .get_started ul{margin:34px -16px 0 0}.XEicon .get_started li{position:relative;float:left;width:286px;height:212px;margin-right:16px;border:1px solid #e8e8e8;background:#fff;text-align:center}.XEicon .get_started li:last-child{margin-right:0}.XEicon .get_started li h2{padding:33px 0 19px;font-size:17px;font-weight:600}.XEicon .get_started li p{padding:0 37px;font-size:14px;line-height:26px;color:#888}.XEicon .get_started li>a{position:absolute;display:block;bottom:0;width:100%;height:50px;background:#888;border-top:1px solid #e1e1e1;line-height:50px;font-size:14px;font-weight:600;text-transform:uppercase;color:#fff;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .get_started li>a:active,.XEicon .get_started li>a:focus,.XEicon .get_started li>a:hover{background-color:#cda25a;color:#fff}.XEicon .get_started li>a .xeicon{display:none;margin-right:6px;font-size:140%;vertical-align:middle}.XEicon .get_started li>a:hover .xeicon{display:inline-block;margin-top:-4px}.XEicon .contribution{height:442px;padding-top:93px;box-sizing:border-box;text-align:center}.XEicon .contribution .cont{font-size:15px;line-height:26px;text-align:center;margin-top:58px;color:#888}.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 40px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:15px;line-height:52px;font-weight:600;letter-spacing:1px;color:#cda25a;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .contribution .btn_github:active .XEicon .contribution .btn_github:focus,.XEicon .contribution .btn_github:hover{background-color:#cda25a;color:#fff}@media all and (max-width:479px){.XEicon .fixedwidth{width:auto}.XEicon .main_title h1{margin-bottom:28px;font-size:21px}.XEicon .main_title p{padding:0 14px;text-align:left}.XEicon .tit h1{font-size:20px;text-align:center;letter-spacing:2px}.XEicon .tit h1:after{left:50%;margin-left:-10px}.XEicon .feature{height:auto;padding-top:90px}.XEicon .feature ul{padding:50px 14px 0}.XEicon .feature li{clear:both;width:auto;padding:0 0 0 70px}.XEicon .feature h2{padding-top:10px}.XEicon .get_started{height:auto;padding:80px 14px 20px}.XEicon .get_started li{float:none;width:auto;margin-right:0;margin-bottom:15px}.XEicon .contribution .cont{padding:0 14px;text-align:left}}
--- a/layouts/xedition/demo/slide.html
+++ b/layouts/xedition/demo/slide.html
@ -1,30 +1,30 @@
-<div data-src="{$layout_info->path}img/slider_img.jpg">
-	<div class="camera_caption fadeIn">
-		<div class="camera_caption_wrap">
+<div style="background-image:url('{$layout_info->path}img/slider_img.jpg');" class="swiper-slide">
+	<div>
+		<div>
 			<h1>SHARING, PUBLISHING.<br />&amp; PLEASURE.</h1>
 			<p>지식을 나누고 컨텐츠를 출판하며 즐거움을 함께합니다.</p>
 		</div>
 	</div>
 </div>
-<div data-src="{$layout_info->path}img/slider_img2.jpg">
-	<div class="camera_caption fadeIn">
-		<div class="camera_caption_wrap">
+<div style="background-image:url('{$layout_info->path}img/slider_img2.jpg');" class="swiper-slide">
+	<div>
+		<div>
 			<h1>MAKING<br />WEB CULTURES</h1>
 			<p>올바른 웹 문화를 지향합니다.</p>
 		</div>
 	</div>
 </div>
-<div data-src="{$layout_info->path}img/slider_img3.jpg">
-	<div class="camera_caption fadeIn">
-		<div class="camera_caption_wrap">
+<div style="background-image:url('{$layout_info->path}img/slider_img3.jpg');" class="swiper-slide">
+	<div>
+		<div>
 			<h1>EVOLUTION &amp; INNOVATION<br />TOGETHER</h1>
 			<p>함께 진화하고 혁신을 추구합니다.</p>
 		</div>
 	</div>
 </div>
-<div data-src="{$layout_info->path}img/slider_img4.jpg">
-	<div class="camera_caption fadeIn">
-		<div class="camera_caption_wrap">
+<div style="background-image:url('{$layout_info->path}img/slider_img4.jpg');" class="swiper-slide">
+	<div>
+		<div>
 			<h1>CREATE A GOOD DESIGN WITH<br />THE POSSIILITY OF TECHNOLOGY</h1>
 			<p>기술의 가능성을 발굴하고 좋은 디자인을 만들어 갑니다.</p>
 		</div>
--- a/layouts/xedition/demo/welcome_main.html
+++ b/layouts/xedition/demo/welcome_main.html
@ -1,6 +1,6 @@
 <!-- WelcomeXE -->
 <div class="welcomeXE">
-	<section class="xeicon">
+	<section class="xeicon bg-holder" data-width="1240" data-height="500">
 		<h1>Beautiful iconpack<br>XEIcon</h1>
 		<div class="button-area">
 			<a class="btn_item" target="_blank" href="http://xpressengine.github.io/XEIcon">HOMEPAGE</a>
--- a/layouts/xedition/js/SmoothScroll.min.js
+++ b/layouts/xedition/js/SmoothScroll.min.js
@ -1,8 +0,0 @@
-// SmoothScroll for websites v1.2.1
-// Licensed under the terms of the MIT license.
-
-// People involved
-//  - Balazs Galambosi (maintainer)  
-//  - Michael Herf     (Pulse Algorithm)
-
-!function(){function e(){var e=!1;e&&c("keydown",r),v.keyboardSupport&&!e&&u("keydown",r)}function t(){if(document.body){var t=document.body,o=document.documentElement,n=window.innerHeight,r=t.scrollHeight;if(S=document.compatMode.indexOf("CSS")>=0?o:t,w=t,e(),x=!0,top!=self)y=!0;else if(r>n&&(t.offsetHeight<=n||o.offsetHeight<=n)){var a=!1,i=function(){a||o.scrollHeight==document.height||(a=!0,setTimeout(function(){o.style.height=document.height+"px",a=!1},500))};if(o.style.height="auto",setTimeout(i,10),S.offsetHeight<=n){var l=document.createElement("div");l.style.clear="both",t.appendChild(l)}}v.fixedBackground||b||(t.style.backgroundAttachment="scroll",o.style.backgroundAttachment="scroll")}}function o(e,t,o,n){if(n||(n=1e3),d(t,o),1!=v.accelerationMax){var r=+new Date,a=r-C;if(a<v.accelerationDelta){var i=(1+30/a)/2;i>1&&(i=Math.min(i,v.accelerationMax),t*=i,o*=i)}C=+new Date}if(M.push({x:t,y:o,lastX:0>t?.99:-.99,lastY:0>o?.99:-.99,start:+new Date}),!T){var l=e===document.body,u=function(){for(var r=+new Date,a=0,i=0,c=0;c<M.length;c++){var s=M[c],d=r-s.start,f=d>=v.animationTime,h=f?1:d/v.animationTime;v.pulseAlgorithm&&(h=p(h));var m=s.x*h-s.lastX>>0,w=s.y*h-s.lastY>>0;a+=m,i+=w,s.lastX+=m,s.lastY+=w,f&&(M.splice(c,1),c--)}l?window.scrollBy(a,i):(a&&(e.scrollLeft+=a),i&&(e.scrollTop+=i)),t||o||(M=[]),M.length?E(u,e,n/v.frameRate+1):T=!1};E(u,e,0),T=!0}}function n(e){x||t();var n=e.target,r=l(n);if(!r||e.defaultPrevented||s(w,"embed")||s(n,"embed")&&/\.pdf/i.test(n.src))return!0;var a=e.wheelDeltaX||0,i=e.wheelDeltaY||0;return a||i||(i=e.wheelDelta||0),!v.touchpadSupport&&f(i)?!0:(Math.abs(a)>1.2&&(a*=v.stepSize/120),Math.abs(i)>1.2&&(i*=v.stepSize/120),o(r,-a,-i),void e.preventDefault())}function r(e){var t=e.target,n=e.ctrlKey||e.altKey||e.metaKey||e.shiftKey&&e.keyCode!==H.spacebar;if(/input|textarea|select|embed/i.test(t.nodeName)||t.isContentEditable||e.defaultPrevented||n)return!0;if(s(t,"button")&&e.keyCode===H.spacebar)return!0;var r,a=0,i=0,u=l(w),c=u.clientHeight;switch(u==document.body&&(c=window.innerHeight),e.keyCode){case H.up:i=-v.arrowScroll;break;case H.down:i=v.arrowScroll;break;case H.spacebar:r=e.shiftKey?1:-1,i=-r*c*.9;break;case H.pageup:i=.9*-c;break;case H.pagedown:i=.9*c;break;case H.home:i=-u.scrollTop;break;case H.end:var d=u.scrollHeight-u.scrollTop-c;i=d>0?d+10:0;break;case H.left:a=-v.arrowScroll;break;case H.right:a=v.arrowScroll;break;default:return!0}o(u,a,i),e.preventDefault()}function a(e){w=e.target}function i(e,t){for(var o=e.length;o--;)z[N(e[o])]=t;return t}function l(e){var t=[],o=S.scrollHeight;do{var n=z[N(e)];if(n)return i(t,n);if(t.push(e),o===e.scrollHeight){if(!y||S.clientHeight+10<o)return i(t,document.body)}else if(e.clientHeight+10<e.scrollHeight&&(overflow=getComputedStyle(e,"").getPropertyValue("overflow-y"),"scroll"===overflow||"auto"===overflow))return i(t,e)}while(e=e.parentNode)}function u(e,t,o){window.addEventListener(e,t,o||!1)}function c(e,t,o){window.removeEventListener(e,t,o||!1)}function s(e,t){return(e.nodeName||"").toLowerCase()===t.toLowerCase()}function d(e,t){e=e>0?1:-1,t=t>0?1:-1,(k.x!==e||k.y!==t)&&(k.x=e,k.y=t,M=[],C=0)}function f(e){if(e){e=Math.abs(e),D.push(e),D.shift(),clearTimeout(A);var t=D[0]==D[1]&&D[1]==D[2],o=h(D[0],120)&&h(D[1],120)&&h(D[2],120);return!(t||o)}}function h(e,t){return Math.floor(e/t)==e/t}function m(e){var t,o,n;return e*=v.pulseScale,1>e?t=e-(1-Math.exp(-e)):(o=Math.exp(-1),e-=1,n=1-Math.exp(-e),t=o+n*(1-o)),t*v.pulseNormalize}function p(e){return e>=1?1:0>=e?0:(1==v.pulseNormalize&&(v.pulseNormalize/=m(1)),m(e))}var w,g={frameRate:150,animationTime:800,stepSize:120,pulseAlgorithm:!0,pulseScale:8,pulseNormalize:1,accelerationDelta:20,accelerationMax:1,keyboardSupport:!0,arrowScroll:50,touchpadSupport:!0,fixedBackground:!0,excluded:""},v=g,b=!1,y=!1,k={x:0,y:0},x=!1,S=document.documentElement,D=[120,120,120],H={left:37,up:38,right:39,down:40,spacebar:32,pageup:33,pagedown:34,end:35,home:36},v=g,M=[],T=!1,C=+new Date,z={};setInterval(function(){z={}},1e4);var A,N=function(){var e=0;return function(t){return t.uniqueID||(t.uniqueID=e++)}}(),E=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||function(e,t,o){window.setTimeout(e,o||1e3/60)}}(),K=/chrome/i.test(window.navigator.userAgent),L="onmousewheel"in document;L&&K&&(u("mousedown",a),u("mousewheel",n),u("load",t))}();
--- a/layouts/xedition/js/camera.min.js
+++ b/layouts/xedition/js/camera.min.js
--- a/layouts/xedition/js/idangerous.swiper.js
+++ b/layouts/xedition/js/idangerous.swiper.js
--- a/layouts/xedition/js/idangerous.swiper.min.js
+++ b/layouts/xedition/js/idangerous.swiper.min.js
--- a/layouts/xedition/js/jquery.easing.js
+++ b/layouts/xedition/js/jquery.easing.js
@ -1,205 +0,0 @@
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2008 George McGinley Smith
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
-*/
-
-// t: current time, b: begInnIng value, c: change In value, d: duration
-jQuery.easing['jswing'] = jQuery.easing['swing'];
-
-jQuery.extend( jQuery.easing,
-{
-	def: 'easeOutQuad',
-	swing: function (x, t, b, c, d) {
-		//alert(jQuery.easing.default);
-		return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
-	},
-	easeInQuad: function (x, t, b, c, d) {
-		return c*(t/=d)*t + b;
-	},
-	easeOutQuad: function (x, t, b, c, d) {
-		return -c *(t/=d)*(t-2) + b;
-	},
-	easeInOutQuad: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t + b;
-		return -c/2 * ((--t)*(t-2) - 1) + b;
-	},
-	easeInCubic: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t + b;
-	},
-	easeOutCubic: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t + 1) + b;
-	},
-	easeInOutCubic: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t + b;
-		return c/2*((t-=2)*t*t + 2) + b;
-	},
-	easeInQuart: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t + b;
-	},
-	easeOutQuart: function (x, t, b, c, d) {
-		return -c * ((t=t/d-1)*t*t*t - 1) + b;
-	},
-	easeInOutQuart: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
-		return -c/2 * ((t-=2)*t*t*t - 2) + b;
-	},
-	easeInQuint: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t*t + b;
-	},
-	easeOutQuint: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t*t*t + 1) + b;
-	},
-	easeInOutQuint: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
-		return c/2*((t-=2)*t*t*t*t + 2) + b;
-	},
-	easeInSine: function (x, t, b, c, d) {
-		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
-	},
-	easeOutSine: function (x, t, b, c, d) {
-		return c * Math.sin(t/d * (Math.PI/2)) + b;
-	},
-	easeInOutSine: function (x, t, b, c, d) {
-		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
-	},
-	easeInExpo: function (x, t, b, c, d) {
-		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
-	},
-	easeOutExpo: function (x, t, b, c, d) {
-		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
-	},
-	easeInOutExpo: function (x, t, b, c, d) {
-		if (t==0) return b;
-		if (t==d) return b+c;
-		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
-		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
-	},
-	easeInCirc: function (x, t, b, c, d) {
-		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
-	},
-	easeOutCirc: function (x, t, b, c, d) {
-		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
-	},
-	easeInOutCirc: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
-		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
-	},
-	easeInElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-	},
-	easeOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
-	},
-	easeInOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
-	},
-	easeInBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*(t/=d)*t*((s+1)*t - s) + b;
-	},
-	easeOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
-	},
-	easeInOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158; 
-		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
-		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
-	},
-	easeInBounce: function (x, t, b, c, d) {
-		return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
-	},
-	easeOutBounce: function (x, t, b, c, d) {
-		if ((t/=d) < (1/2.75)) {
-			return c*(7.5625*t*t) + b;
-		} else if (t < (2/2.75)) {
-			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
-		} else if (t < (2.5/2.75)) {
-			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
-		} else {
-			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
-		}
-	},
-	easeInOutBounce: function (x, t, b, c, d) {
-		if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
-		return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
-	}
-});
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2001 Robert Penner
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
--- a/layouts/xedition/js/jquery.easing.min.js
+++ b/layouts/xedition/js/jquery.easing.min.js
@ -1 +0,0 @@
-jQuery.easing.jswing=jQuery.easing.swing,jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(a,b,c,d,e){return jQuery.easing[jQuery.easing.def](a,b,c,d,e)},easeInQuad:function(a,b,c,d,e){return d*(b/=e)*b+c},easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d*(b/=e)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=b/e-1)*b*b+1)+c},easeInOutCubic:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b+c:d/2*((b-=2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=e)*b*b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=b/e-1)*b*b*b-1)+c},easeInOutQuart:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b+c:-d/2*((b-=2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=e)*b*b*b*b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=b/e-1)*b*b*b*b+1)+c},easeInOutQuint:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b*b+c:d/2*((b-=2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return 0==b?c:d*Math.pow(2,10*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d*(-Math.pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){return 0==b?c:b==e?c+d:(b/=e/2)<1?d/2*Math.pow(2,10*(b-1))+c:d/2*(-Math.pow(2,-10*--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=e)*b)-1)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=b/e-1)*b)+c},easeInOutCirc:function(a,b,c,d,e){return(b/=e/2)<1?-d/2*(Math.sqrt(1-b*b)-1)+c:d/2*(Math.sqrt(1-(b-=2)*b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(1==(b/=e))return c+d;if(g||(g=.3*e),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(b-=1))*Math.sin(2*(b*e-f)*Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(1==(b/=e))return c+d;if(g||(g=.3*e),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*b)*Math.sin(2*(b*e-f)*Math.PI/g)+d+c},easeInOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(2==(b/=e/2))return c+d;if(g||(g=.3*e*1.5),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return 1>b?-.5*h*Math.pow(2,10*(b-=1))*Math.sin(2*(b*e-f)*Math.PI/g)+c:h*Math.pow(2,-10*(b-=1))*Math.sin(2*(b*e-f)*Math.PI/g)*.5+d+c},easeInBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),d*(b/=e)*b*((f+1)*b-f)+c},easeOutBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),d*((b=b/e-1)*b*((f+1)*b+f)+1)+c},easeInOutBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),(b/=e/2)<1?d/2*b*b*(((f*=1.525)+1)*b-f)+c:d/2*((b-=2)*b*(((f*=1.525)+1)*b+f)+2)+c},easeInBounce:function(a,b,c,d,e){return d-jQuery.easing.easeOutBounce(a,e-b,0,d,e)+c},easeOutBounce:function(a,b,c,d,e){return(b/=e)<1/2.75?7.5625*d*b*b+c:2/2.75>b?d*(7.5625*(b-=1.5/2.75)*b+.75)+c:2.5/2.75>b?d*(7.5625*(b-=2.25/2.75)*b+.9375)+c:d*(7.5625*(b-=2.625/2.75)*b+.984375)+c},easeInOutBounce:function(a,b,c,d,e){return e/2>b?.5*jQuery.easing.easeInBounce(a,2*b,0,d,e)+c:.5*jQuery.easing.easeOutBounce(a,2*b-e,0,d,e)+.5*d+c}});
--- a/layouts/xedition/js/jquery.mobile.customized.min.js
+++ b/layouts/xedition/js/jquery.mobile.customized.min.js
--- a/layouts/xedition/js/jquery.parallax-scroll.js
+++ b/layouts/xedition/js/jquery.parallax-scroll.js
@ -0,0 +1,126 @@
+/*
+ *  Parallax-Scroll - v0.2.0
+ *  jQuery plugin for background-attachment: scroll with friction, similar to the parallax scrolling effect on Spotify.
+ *  http://parallax-scroll.aenism.com
+ *
+ *  Made by Aen Tan
+ *  Under MIT License
+ */
+;(function (root, factory) {
+    if (typeof define === "function" && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(["jquery"], factory);
+    } else {
+        // Browser globals
+        factory(root.jQuery);
+    }
+}(this, function ($) {
+    "use strict";
+
+    var ParallaxScroll,
+        defaults = {
+          friction: 0.5,
+          direction: "vertical"
+        },
+        $win = $(window),
+        lastTickTime = 0;
+    
+    window.requestAnimationFrame = function (callback) {
+      var currTime = new Date().getTime();
+      var timeToCall = Math.max(0, 5 - (currTime - lastTickTime));
+      var id = window.setTimeout(function () {
+        callback(currTime + timeToCall);
+      }, timeToCall);
+      lastTickTime = currTime + timeToCall;
+      return id;
+    };
+
+    ParallaxScroll = function (background, options) {
+      return {
+        init: function () {
+          this.$background = $(background);
+          this.settings = $.extend({}, defaults, options);
+          this._initStyles();
+          this._bindEvents();
+        },
+        _initStyles: function () {
+          this.$background.css({
+            "background-attachment": "scroll"
+          });
+        },
+        _visibleInViewport: function () {
+          var vpHeight  = $win.height();
+          var rec = this.$background.get(0).getBoundingClientRect();
+          return (rec.top < vpHeight && rec.bottom > 0) || (rec.bottom <= vpHeight && rec.top > vpHeight);
+      	},
+        _bindEvents: function () {
+          var self = this;
+          $win.on("load scroll resize", function () {
+            self._requestTick();
+          });
+        },
+        _requestTick: function () {
+          var self = this;
+          if (!this.ticking) {
+            this.ticking = true;
+            requestAnimationFrame(function () {
+              self._updateBgPos();
+            });
+          }
+        },
+        _updateBgPos: function () {
+          if (this._visibleInViewport()) {
+            var winW = $win.width();
+            var winH = $win.height();
+            var imgW = this.$background.data("width");
+            var imgH = this.$background.data("height");
+            var imgA = imgW / imgH;
+            var bgW = this.$background.width();
+            var bgH = this.$background.height();
+            var bgA = bgW / bgH;
+            var revA = bgA < imgA;
+            var bgScale = bgW / imgW;
+            var bgScaledH = imgH * bgScale;
+            var bgScaledW = imgW * bgScale;
+            var bgOffsetTop = this.$background.offset().top;
+            var winScrollTop = $win.scrollTop();
+            var bgScrollTop = winScrollTop - bgOffsetTop;
+            var xDistToMove = winH + bgScaledH;
+            var yDistToMove = winW + bgScaledW;
+            var xf1 = bgScrollTop * (winH / xDistToMove);
+            var xf2 = bgScrollTop / winH;
+            var yf1 = bgScrollTop * (winW / yDistToMove);
+            var yf2 = bgScrollTop / winW;
+            var centerOffsetY = (winH - bgH) / 2;
+            centerOffsetY = revA ? centerOffsetY * xf2 : centerOffsetY;
+            var centerOffsetX = (winW - bgW) / 2;
+            centerOffsetX = revA ? centerOffsetX : centerOffsetX * yf2;
+            var bgFriction = revA? this.settings.friction * (bgA * 2) : this.settings.friction * bgA;
+            var bgSize;
+            var bgPos;
+            if (this.settings.direction === "horizontal") {
+              bgSize = revA ? winW + "px auto" : "auto " + winH + "px";
+              bgPos = (centerOffsetX - (yf1 * bgFriction)) + "px 50%";
+            } else {
+              bgSize = revA ? "auto " + winH + "px" : winW + "px auto";
+              bgPos = "50% " + ((xf1 * bgFriction) - centerOffsetY) + "px";
+            }
+            this.$background.css({
+              "background-size": bgSize,
+              "background-position": bgPos
+            });
+          }
+          this.ticking = false;
+        }
+      };
+    };
+
+    ParallaxScroll.defaults = defaults;
+    $.fn.parallaxScroll = function (options) {
+      return this.each(function () {
+        new ParallaxScroll(this, options).init();
+      });
+    };
+
+    return ParallaxScroll;
+}));
--- a/layouts/xedition/js/jquery.parallax-scroll.min.js
+++ b/layouts/xedition/js/jquery.parallax-scroll.min.js
@ -0,0 +1,9 @@
+/*
+ *  Parallax-Scroll - v0.2.0
+ *  jQuery plugin for background-attachment: scroll with friction, similar to the parallax scrolling effect on Spotify.
+ *  http://parallax-scroll.aenism.com
+ *
+ *  Made by Aen Tan
+ *  Under MIT License
+ */
+!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):b(a.jQuery)}(this,function(a){"use strict";var b,c={friction:.5,direction:"vertical"},d=a(window),e=0;return window.requestAnimationFrame=function(a){var b=(new Date).getTime(),c=Math.max(0,5-(b-e)),d=window.setTimeout(function(){a(b+c)},c);return e=b+c,d},b=function(b,e){return{init:function(){this.$background=a(b),this.settings=a.extend({},c,e),this._initStyles(),this._bindEvents()},_initStyles:function(){this.$background.css({"background-attachment":"scroll"})},_visibleInViewport:function(){var a=d.height(),b=this.$background.get(0).getBoundingClientRect();return b.top<a&&b.bottom>0||b.bottom<=a&&b.top>a},_bindEvents:function(){var a=this;d.on("load scroll resize",function(){a._requestTick()})},_requestTick:function(){var a=this;this.ticking||(this.ticking=!0,requestAnimationFrame(function(){a._updateBgPos()}))},_updateBgPos:function(){if(this._visibleInViewport()){var a=d.width(),b=d.height(),c=this.$background.data("width"),e=this.$background.data("height"),f=c/e,g=this.$background.width(),h=this.$background.height(),i=g/h,j=f>i,k=g/c,l=e*k,m=c*k,n=this.$background.offset().top,o=d.scrollTop(),p=o-n,q=b+l,r=a+m,s=p*(b/q),t=p/b,u=p*(a/r),v=p/a,w=(b-h)/2;w=j?w*t:w;var x=(a-g)/2;x=j?x:x*v;var y,z,A=j?2*this.settings.friction*i:this.settings.friction*i;"horizontal"===this.settings.direction?(y=j?a+"px auto":"auto "+b+"px",z=x-u*A+"px 50%"):(y=j?"auto "+b+"px":a+"px auto",z="50% "+(s*A-w)+"px"),this.$background.css({"background-size":y,"background-position":z})}this.ticking=!1}}},b.defaults=c,a.fn.parallaxScroll=function(a){return this.each(function(){new b(this,a).init()})},b});
--- a/layouts/xedition/js/layout.js
+++ b/layouts/xedition/js/layout.js
@ -1,4 +1,4 @@
-(function($){
+ (function($){
    "use strict";
    $(function(){
        var $shrinkHeaderHeight = 300;
@ -38,9 +38,13 @@
            });
            $(window).triggerHandler('scroll');
        }
-
        // Gnb
-        $gnb.find('>ul>li>a')
+        if($(document).width() > 480){
+	        $gnb.addClass('pc-gnb');
+        }
+        
+        var $pc_gnb = $('.pc-gnb');
+        $pc_gnb.find('>ul>li>a')
        .mouseover(function(){
            $gnb.find('>ul>li>ul:visible').hide().parent('li').removeClass('on');
            $(this).next('ul:hidden').stop().fadeIn(200).parent('li').addClass('on')
@ -53,7 +57,7 @@
            $gnb.find('>ul>li>ul').hide().parent().removeClass('on')
        });

-       $gnb.find('>ul>li>ul>li>a')
+		$pc_gnb.find('>ul>li>ul>li>a')
        .mouseover(function(){
            $gnb.find('>ul>li>ul>li>ul:visible').hide().parent('li').removeClass('on');
            $(this).next('ul:hidden').stop().fadeIn(200).parent('li').addClass('on')
@ -65,7 +69,16 @@
        .mouseleave(function(){
            $gnb.find('>ul>li>ul>li>ul').hide().parent().removeClass('on')
        });
-
+        
+		$("#mobile_menu_btn").on('click', function(){
+			var isOpened = $(this);
+			if(isOpened.hasClass('opened')){
+				$("#gnb").find(">ul").slideUp(200);
+			}else{
+				$("#gnb").find(">ul:not(:animated)").slideDown(200);
+			}
+			isOpened.toggleClass('opened');
+		});
        // login popup
        $hoverEl.on('mouseenter mouseleave focusin focusout',function(e){
            e.preventDefault();
@ -75,8 +88,7 @@
                $(this).removeClass('on');
            }
        });
-
-        // Search
+		// Search
        $searchEl.click(function(){
            if($searchForm.is(':hidden')){
                $searchForm.fadeIn().find('input').focus();
@ -114,6 +126,11 @@
                time: 3000
            });
        }
+        
+        // Login help, warning
+        $("#warning").on('touchend', function(e){
+	        $(this).css('display', 'none');
+        });

        // Scroll to top
        var scrollToTop = function() {
@ -139,7 +156,6 @@
        $('.sub_type3 .bg_img').parallax('50%',0.4);
    })
 })(jQuery);
-
 (function($) {
    "use strict";
    var $window = $(window);
@ -190,3 +206,11 @@
  }
 })(jQuery);

+
+(function($){
+	 $(function(){
+		$('.bg-holder').parallaxScroll({
+		  friction: 0.2
+		});
+    });
+})(jQuery);
--- a/layouts/xedition/js/layout.min.js
+++ b/layouts/xedition/js/layout.min.js
@ -1 +1 @@
-!function(a){"use strict";a(function(){var b=300,c=a(".fixed_header .header_wrap"),d=a(".gnb"),e=a(".hover"),f=a(".click > a"),g=a(".search_area");if(c.length){var h=(c.height(),!1),i=c.find(".header h1 img"),j=i.data("logo"),k=i.attr("src");a(window).scroll(function(){var d=a(this).scrollTop();d>=b?h||(c.addClass("shrink"),j&&i.attr("src",j),h=!0):h&&(c.removeClass("shrink"),j&&i.attr("src",k),h=!1)}),a(window).triggerHandler("scroll")}d.find(">ul>li>a").mouseover(function(){d.find(">ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul").hide().parent().removeClass("on")}),d.find(">ul>li>ul>li>a").mouseover(function(){d.find(">ul>li>ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul>li>ul").hide().parent().removeClass("on")}),e.on("mouseenter mouseleave focusin focusout",function(b){b.preventDefault(),"mouseenter"==b.type||"focusin"==b.type?a(this).addClass("on"):a(this).removeClass("on")}),f.click(function(){return g.is(":hidden")&&(g.fadeIn().find("input").focus(),a(".magazine").length>0?(a(".custom_area").css("opacity",0),a(".side").css("opacity",0)):a(".header").css("opacity",0)),!1}),a(".btn_close").click(function(){var b=a(this);return b.parent().fadeOut().find("input").val(""),a(".magazine").length>0?(a(".custom_area").css("opacity",1),a(".side").css("opacity",1)):a(".header").css("opacity",1),f.focus(),!1}),a.isFunction(a.fn.camera)&&a(".camera_wrap").length&&a(".camera_wrap").camera({height:"600px",pagination:!0,thumbnails:!1,playPause:!1,loader:"none",fx:"simpleFade",time:3e3});var l=function(){var b=a(".btn_top"),c=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;a(window).scroll(function(){a(this).scrollTop()>150&&c>1e3?b.fadeIn(100):b.fadeOut(100)}),b.click(function(){return a("html, body").animate({scrollTop:0},400),!1})};l(),a(".sub_type3 .bg_img").parallax("50%",.4)})}(jQuery),function(a){"use strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);
+!function(a){"use strict";a(function(){var b=300,c=a(".fixed_header .header_wrap"),d=a(".gnb"),e=a(".hover"),f=a(".click > a"),g=a(".search_area");if(c.length){var h=(c.height(),!1),i=c.find(".header h1 img"),j=i.data("logo"),k=i.attr("src");a(window).scroll(function(){var d=a(this).scrollTop();d>=b?h||(c.addClass("shrink"),j&&i.attr("src",j),h=!0):h&&(c.removeClass("shrink"),j&&i.attr("src",k),h=!1)}),a(window).triggerHandler("scroll")}a(document).width()>480&&d.addClass("pc-gnb");var l=a(".pc-gnb");l.find(">ul>li>a").mouseover(function(){d.find(">ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul").hide().parent().removeClass("on")}),l.find(">ul>li>ul>li>a").mouseover(function(){d.find(">ul>li>ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul>li>ul").hide().parent().removeClass("on")}),a("#mobile_menu_btn").on("click",function(){var b=a(this);b.hasClass("opened")?a("#gnb").find(">ul").slideUp(200):a("#gnb").find(">ul:not(:animated)").slideDown(200),b.toggleClass("opened")}),e.on("mouseenter mouseleave focusin focusout",function(b){b.preventDefault(),"mouseenter"==b.type||"focusin"==b.type?a(this).addClass("on"):a(this).removeClass("on")}),f.click(function(){return g.is(":hidden")&&(g.fadeIn().find("input").focus(),a(".magazine").length>0?(a(".custom_area").css("opacity",0),a(".side").css("opacity",0)):a(".header").css("opacity",0)),!1}),a(".btn_close").click(function(){var b=a(this);return b.parent().fadeOut().find("input").val(""),a(".magazine").length>0?(a(".custom_area").css("opacity",1),a(".side").css("opacity",1)):a(".header").css("opacity",1),f.focus(),!1}),a.isFunction(a.fn.camera)&&a(".camera_wrap").length&&a(".camera_wrap").camera({height:"600px",pagination:!0,thumbnails:!1,playPause:!1,loader:"none",fx:"simpleFade",time:3e3}),a("#warning").on("touchend",function(b){a(this).css("display","none")});var m=function(){var b=a(".btn_top"),c=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;a(window).scroll(function(){a(this).scrollTop()>150&&c>1e3?b.fadeIn(100):b.fadeOut(100)}),b.click(function(){return a("html, body").animate({scrollTop:0},400),!1})};m(),a(".sub_type3 .bg_img").parallax("50%",.4)})}(jQuery),function(a){"use strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery),function(a){a(function(){a(".bg-holder").parallaxScroll({friction:.2})})}(jQuery);
--- a/layouts/xedition/js/welcome.js
+++ b/layouts/xedition/js/welcome.js
@ -1,7 +1,7 @@
 (function($){
  "user strict";
  $(function(){
-    $('.xeicon').parallax('50%', 0.4);
+    //$('.xeicon').parallax('50%', 0.4);

    $('.fe_box').on('mouseenter mouseleave',function(e){
      $this = $(this);
--- a/layouts/xedition/js/welcome.min.js
+++ b/layouts/xedition/js/welcome.min.js
@ -1 +1 @@
-!function(a){"user strict";a(function(){a(".xeicon").parallax("50%",.4),a(".fe_box").on("mouseenter mouseleave",function(b){$this=a(this),"mouseenter"==b.type?$this.addClass("on"):$this.removeClass("on")})})}(jQuery),function(a){"user strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.hasClass("xeicon")?j.offset().top+600:j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);
+!function(a){"user strict";a(function(){a(".fe_box").on("mouseenter mouseleave",function(b){$this=a(this),"mouseenter"==b.type?$this.addClass("on"):$this.removeClass("on")})})}(jQuery),function(a){"user strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.hasClass("xeicon")?j.offset().top+600:j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);
--- a/layouts/xedition/layout.html
+++ b/layouts/xedition/layout.html
@ -1,5 +1,5 @@
 <!--// META -->
-{Context::addHtmlHeader('<meta name="viewport" content="width=1240">')}
+{Context::addHtmlHeader('<meta name="viewport" content="width=device-width, user-scalable=yes">')}
 <!--// LANG -->
 <load target="./lang" />

@ -15,7 +15,7 @@
 	{@ $sub_header_title = $module_info->browser_title}

 <!--// 초기화 -->
-	{@ $_enable_slide = true}
+	{@ $_enable_slide = false}
 	{@ $_enable_unb = false}
 	{@ $_sample_slide = false}
 	{@ $_sample_footer = false}
@ -29,9 +29,13 @@
 	<block cond="!$layout_info->use_slide">{@ $layout_info->use_slide = 'Y'}</block>
 	<block cond="!$layout_info->enable_intergration_search">{@ $layout_info->enable_intergration_search = 'Y'}</block>

+	<block cond="$layout_info->use_slide === 'Y'">
+		{@ $_enable_slide = true}
+	</block>
 	<block cond="$layout_info->use_demo === 'Y'">
 		{@ $_sample_slide = true}
-		<block cond="$_is_indexmodule">{@ $layout_info->use_slide = 'Y'}</block>
+		{@ $_enable_slide = false}
+		<block cond="$_is_indexmodule">{@ $_enable_slide = true}</block>
 	</block>
 	<block cond="!$layout_info->slide_img1">{@ $_sample_slide = true}</block>
 	<block cond="$layout_info->use_demo === 'Y'">{@ $_sample_footer = true}</block>
@ -141,17 +145,16 @@

 <!--// CSS -->
 <load target="./css/layout.css" />
-<load target="./css/camera.css" />
+<load target="./css/idangerous.swiper.css" />
 <load target="./css/welcome.css" />
 <load target="./css/webfont.css" />
 <load target="./css/xeicon.css" cond="$mid === 'xeicon'" />
 <load target="../../common/xeicon/xeicon.min.css" />
 <!--// JS -->
-<load target="./js/jquery.easing.js" />
-<load cond="$_enable_slide" target="./js/camera.min.js" />
+<load cond="$_enable_slide" target="./js/idangerous.swiper.min.js" />
 <load target="./js/layout.js" />
 <load cond="$layout_info->use_demo ==='Y'" target="./js/welcome.js" />
-<load target="./js/SmoothScroll.min.js" />
+<load target="./js/jquery.parallax-scroll.min.js" />


 <!--// BODY -->
@ -174,7 +177,7 @@
 			</div>
 		</div>

-		<header class="header">
+		<header class="header {$_visual_class}">
 			<!--// LOGO -->
 			<h1 class="logo-item">
 				{@ $_logo_img = $layout_info->logo_img}
@ -257,6 +260,13 @@

 			<!-- GNB -->
 			<nav cond="$GNB->list" class="gnb" id="gnb">
+				<div id="mobile_menu_btn" class="menu_btn">
+					<div class="menu_bar">
+						<div class="btn1"></div>
+						<div class="btn2"></div>
+						<div class="btn3"></div>
+					</div>
+				</div>
 				<ul>
 					<li loop="$GNB->list => $key1, $val1">
 						<a href="{$val1['href']}" target="_blank"|cond="$val1['open_window'] == 'Y'">{$val1['link']}</a>
@ -290,52 +300,56 @@
 			<h1>{$sub_header_title}</h1>
 		</div>
 	</div>
-
-	<div cond="$layout_info->layout_type === 'main' && $_enable_slide" class="visual">
-			<!-- 슬라이드 -->
-			<div class="camera_wrap">
-			<!--@if($_sample_slide)-->
-				<include target="./demo/slide.html" />
-			<!--@else-->
-				<div cond="$layout_info->slide_img1" data-src="{$layout_info->slide_img1}">
-					<div cond="$layout_info->slide_text1" class="camera_caption fadeIn">
-						<div class="camera_caption_wrap">
-							{$layout_info->slide_text1}
-						</div>
+    <!-- Swiper -->
+    <div cond="$layout_info->layout_type === 'main' && $_enable_slide" class="visual swiper-container">
+		<!-- 슬라이드 -->
+		<div class="swiper-wrapper">
+		<!--@if($_sample_slide)-->
+			<include target="./demo/slide.html" />
+		<!--@else-->
+			<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');" class="swiper-slide">
+				<div cond="$layout_info->slide_text1">
+					<div>
+						{$layout_info->slide_text1}
 					</div>
 				</div>
-				<div cond="$layout_info->slide_img2" data-src="{$layout_info->slide_img2}">
-					<div cond="$layout_info->slide_text2" class="camera_caption fadeIn">
-						<div class="camera_caption_wrap">
-							{$layout_info->slide_text2}
-						</div>
-					</div>
-				</div>
-				<div cond="$layout_info->slide_img3" data-src="{$layout_info->slide_img3}">
-					<div cond="$layout_info->slide_text3" class="camera_caption fadeIn">
-						<div class="camera_caption_wrap">
-							{$layout_info->slide_text3}
-						</div>
-					</div>
-				</div>
-				<div cond="$layout_info->slide_img4" data-src="{$layout_info->slide_img4}">
-					<div cond="$layout_info->slide_text4" class="camera_caption fadeIn">
-						<div class="camera_caption_wrap">
-							{$layout_info->slide_text4}
-						</div>
-					</div>
-				</div>
-				<div cond="$layout_info->slide_img5" data-src="{$layout_info->slide_img5}">
-					<div cond="$layout_info->slide_text5" class="camera_caption fadeIn">
-						<div class="camera_caption_wrap">
-							{$layout_info->slide_text5}
-						</div>
-					</div>
-				</div>
-			<!--@end-->
 			</div>
-			<!-- END:슬라이드 -->
-	</div>
+			<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');" class="swiper-slide">
+				<div cond="$layout_info->slide_text2">
+					<div>
+						{$layout_info->slide_text2}
+					</div>
+				</div>
+			</div>
+			<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');" class="swiper-slide">
+				<div cond="$layout_info->slide_text3">
+					<div>
+						{$layout_info->slide_text3}
+					</div>
+				</div>
+			</div>
+			<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');" class="swiper-slide">
+				<div cond="$layout_info->slide_text4">
+					<div>
+						{$layout_info->slide_text4}
+					</div>
+				</div>
+			</div>
+			<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');" class="swiper-slide">
+				<div cond="$layout_info->slide_text5">
+					<div>
+						{$layout_info->slide_text5}
+					</div>
+				</div>
+			</div>
+		<!--@end-->
+		</div>
+		<!-- END:슬라이드 -->
+        <!-- Add Pagination -->
+        <div class="swiper-pagination"></div>
+        <div class="swiper-button left"><button type="button" class="swiper-button-prev"><i class="xi-angle-left"></i></button></div>
+		<div class="swiper-button right"><button type="button" class="swiper-button-next"><i class="xi-angle-right"></i></button></div>
+    </div>
 	<!-- /VISUAL -->

 	<!-- BODY -->
@ -408,6 +422,15 @@
 					<include target="./demo/copyright.html" />
 				<!--@end-->
 			</p>
+			<ul class="mobile-footer-member">
+				<!--@if(!$is_logged)-->
+				<li><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
+				<li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+				<!--@else-->
+				<li><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
+				<li><a href="{getUrl('act','dispMemberInfo')}">{$lang->cmd_view_member_info}</a></li>
+				<!--@end-->
+			</ul>
 		</div>
 	</footer>
 </div>
@ -454,6 +477,7 @@
 							<span class="checkbox"></span> {$lang->keep_signed}
 						</label>
 						<div id="warning">
+							<p style="text-align:right;"><i class="xi-close"></i></p>
 							<p>{str_replace('\n\n', '<br />', $lang->about_keep_signed)}</p>
 							<div class="edge"></div>
 						</div>
@ -500,4 +524,22 @@
 	});
 	</script>
 </section>
-<!-- /Login widget -->
+<!-- /Login widget -->    
+<script cond="$_enable_slide">
+jQuery(document).ready(function () {
+	var swiper = new Swiper('.swiper-container', {
+	    autoplay: 6000,
+	    loop: true,
+	    pagination: '.swiper-pagination',
+	    paginationClickable: true
+	});
+	jQuery('.swiper-button-next').on('click', function(e){
+		e.preventDefault();
+		swiper.swipeNext();
+	});
+	jQuery('.swiper-button-prev').on('click', function(e){
+		e.preventDefault();
+		swiper.swipePrev();
+	});
+});
+</script>
--- a/modules/admin/tpl/js/admin.min.js
+++ b/modules/admin/tpl/js/admin.min.js
--- a/modules/admin/tpl/js/config.min.js
+++ b/modules/admin/tpl/js/config.min.js
@ -1 +1 @@
-function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a),jQuery("#index_module_srl").val(b),jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}function getFTPList(a){var b=jQuery("#ftp_form").get(0);b.ftp_root_path.value="undefined"!=typeof a?a:!b.ftp_root_path.value&&"undefined"!=typeof b.sftp&&b.sftp.checked?xe_root:"/";var c=[];c.ftp_user=jQuery("#ftp_user").val(),c.ftp_password=jQuery("#ftp_password").val(),c.ftp_host=jQuery("#ftp_host").val(),c.ftp_port=jQuery("#ftp_port").val(),c.ftp_root_path=jQuery("#ftp_root_path").val(),c.sftp=jQuery("input[name=sftp]:checked").val(),exec_xml("admin","getAdminFTPList",c,completeGetFtpInfo,["list","error","message"],c,b)}function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}function completeGetFtpInfo(a){if(0!==a.error)return alert(a.error),void alert(a.message);var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]),pwd=jQuery("#ftp_form").get(0).ftp_root_path.value,"/"!=pwd&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var d=0;d<a.list.item.length;d++){var e=a.list.item[d];"../"!=e&&"./"!=e&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+pwd+e+"')\">"+e+"</button></li>")}c="<ul>"+c+"</ul>",b.append(jQuery(c))}function deleteIcon(a){var b=[];b.iconname=a,exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b),icon=a}function iconDeleteMessage(a){alert(a.message),"0"==a.error&&("favicon.ico"==icon?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):"mobicon.png"==icon&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}function doRecompileCacheFile(){if(confirm(xe.lang.confirm_run)){var a=[];exec_xml("admin","procAdminRecompileCacheFile",a,completeCacheMessage)}}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl,exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu)}}function completeResetAdminMenu(){document.location.reload()}jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});var icon=null;
+function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a),jQuery("#index_module_srl").val(b),jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}function getFTPList(a){var b=jQuery("#ftp_form").get(0);"undefined"!=typeof a?b.ftp_root_path.value=a:!b.ftp_root_path.value&&"undefined"!=typeof b.sftp&&b.sftp.checked?b.ftp_root_path.value=xe_root:b.ftp_root_path.value="/";var c=[];c.ftp_user=jQuery("#ftp_user").val(),c.ftp_password=jQuery("#ftp_password").val(),c.ftp_host=jQuery("#ftp_host").val(),c.ftp_port=jQuery("#ftp_port").val(),c.ftp_root_path=jQuery("#ftp_root_path").val(),c.sftp=jQuery("input[name=sftp]:checked").val(),exec_xml("admin","getAdminFTPList",c,completeGetFtpInfo,["list","error","message"],c,b)}function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}function completeGetFtpInfo(a){if(0!==a.error)return alert(a.error),void alert(a.message);var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]),pwd=jQuery("#ftp_form").get(0).ftp_root_path.value,"/"!=pwd&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var d=0;d<a.list.item.length;d++){var e=a.list.item[d];"../"!=e&&"./"!=e&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+pwd+e+"')\">"+e+"</button></li>")}c="<ul>"+c+"</ul>",b.append(jQuery(c))}function deleteIcon(a){var b=[];b.iconname=a,exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b),icon=a}function iconDeleteMessage(a){alert(a.message),"0"==a.error&&("favicon.ico"==icon?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):"mobicon.png"==icon&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}function doRecompileCacheFile(){if(confirm(xe.lang.confirm_run)){var a=[];exec_xml("admin","procAdminRecompileCacheFile",a,completeCacheMessage)}}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl,exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu)}}function completeResetAdminMenu(a){document.location.reload()}jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});var icon=null;
--- a/modules/admin/tpl/js/menu_setup.min.js
+++ b/modules/admin/tpl/js/menu_setup.min.js
@ -1 +1 @@
-jQuery(function(a){function b(b){var c;if(moduleList=b.menuList){var d=a("#menuNameList");for(var e in moduleList){var f=moduleList[e];c=a('<optgroup label="'+e+'" />').appendTo(d);for(var g in f)c.append('<option value="'+e+":"+g+'">'+f[g].title+"</option>")}}}var c,d,e=a("#editForm"),f=a("#listForm");a("a._add").click(function(){if(d=a(this).parent().prevAll("._item_key").val(),e.find("input[name=parent_srl]").val(d),!c){var f=[],g=["menuList"];exec_xml("menu","procMenuAdminAllActList",f,b,g)}}),a("a._parent_delete").click(function(){var b=a(this).parent().prevAll("._parent_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()}),a("a._child_delete").click(function(){var b=a(this).closest("li").find("._item_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()})}),jQuery(function(a){function b(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}a("form.adminMap").delegate("li:not(.placeholder)","dropped.st",function(){var b,c,d=a(this);b=d.find(">input._parent_key"),c=!!d.parent("ul").parent("li").length,b.val(c?d.parent("ul").parent("li").find(">input._item_key").val():"0")});var c=!1,d=a('<li class="placeholder">');a("form.adminMap>ul").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(e){var f,g,h,i,j,k,l,m,n,o;if(!a(e.target).is("a,input,label,textarea")&&1==e.which){for(c=!0,f=a(this),j=f.height(),i=f.width(),g=f.parentsUntil(".adminMap").filter("ul"),h=g.eq(-1),l={x:e.pageX,y:e.pageY},k=b(this,h.get(0)),$clone=f.clone(!0).attr("target",!0),n=g.length-1;n;n--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();return m=[],h.find("li").each(function(){if(f[0]===this||f.has(this).length)return!0;var c=b(this,h.get(0));m.push({top:c.top,bottom:c.top+32,$item:a(this)})}),$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:.6,width:i,height:j,left:k.left,top:k.top,zIndex:100}).appendTo(h.eq(0)),d.css({position:"absolute",opacity:.6,width:i,height:"10px",left:k.left,top:k.top,zIndex:99}).appendTo(h.eq(0)),f.css("opacity",.6),a(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f,g;for(o=null,b={x:l.x-a.pageX,y:l.y-a.pageY},c=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],g.top>c||g.bottom<c||(o={element:g.$item},g.$item.hasClass("parent")?(o.state="prepend",d.css("top",g.bottom-5)):g.top>c-12?(o.state="before",d.css("top",g.top-5)):(o.state="after",d.css("top",g.bottom-5)));$clone.css({top:c})}).bind("mouseup.st",function(){var b,e;c=!1,a(document).unbind("mousemove.st mouseup.st"),f.css("opacity",""),$clone.remove(),d.remove(),e=a("<li />").height(f.height()),o&&(b=a(o.element),f.before(e),"prepend"==o.state?(b.find(">ul").length||b.find(">.side").after("<ul>"),b.find(">ul").prepend(f.hide())):b[o.state](f.hide()),f.slideDown(100,function(){f.removeClass("active")}),e.slideUp(100,function(){var a=e.parent();e.remove(),a.children("li").length||a.remove()}),f.trigger("dropped.st"))}),!1}},"mouseover.st":function(){return c||a(this).addClass("active"),!1},"mouseout.st":function(){return c||a(this).removeClass("active"),!1}}).find("li li").prepend('<button type="button" class="moveTo">Move to</button>').end().end(),a('<div id="dropzone-marker" />').css({display:"none",position:"absolute",backgroundColor:"#000",opacity:.7}).appendTo("body")});
+jQuery(function(a){function b(b){var c;if(moduleList=b.menuList,moduleList){var d=a("#menuNameList");for(var e in moduleList){var f=moduleList[e];c=a('<optgroup label="'+e+'" />').appendTo(d);for(var g in f)c.append('<option value="'+e+":"+g+'">'+f[g].title+"</option>")}}}var c,d,e=a("#editForm"),f=a("#listForm");a("a._add").click(function(){if(d=a(this).parent().prevAll("._item_key").val(),e.find("input[name=parent_srl]").val(d),!c){var f=[],g=["menuList"];exec_xml("menu","procMenuAdminAllActList",f,b,g)}}),a("a._parent_delete").click(function(){var b=a(this).parent().prevAll("._parent_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()}),a("a._child_delete").click(function(){var b=a(this).closest("li").find("._item_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()})}),jQuery(function(a){function b(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}a("form.adminMap").delegate("li:not(.placeholder)","dropped.st",function(){var b,c,d=a(this);b=d.find(">input._parent_key"),c=!!d.parent("ul").parent("li").length,c?b.val(d.parent("ul").parent("li").find(">input._item_key").val()):b.val("0")});var c=!1,d=a('<li class="placeholder">');a("form.adminMap>ul").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(e){var f,g,h,i,j,k,l,m,n,o;if(!a(e.target).is("a,input,label,textarea")&&1==e.which){for(c=!0,f=a(this),j=f.height(),i=f.width(),g=f.parentsUntil(".adminMap").filter("ul"),h=g.eq(-1),l={x:e.pageX,y:e.pageY},k=b(this,h.get(0)),$clone=f.clone(!0).attr("target",!0),n=g.length-1;n;n--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();return m=[],h.find("li").each(function(c){if(f[0]===this||f.has(this).length)return!0;var d=b(this,h.get(0));m.push({top:d.top,bottom:d.top+32,$item:a(this)})}),$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:.6,width:i,height:j,left:k.left,top:k.top,zIndex:100}).appendTo(h.eq(0)),d.css({position:"absolute",opacity:.6,width:i,height:"10px",left:k.left,top:k.top,zIndex:99}).appendTo(h.eq(0)),f.css("opacity",.6),a(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f,g;for(o=null,b={x:l.x-a.pageX,y:l.y-a.pageY},c=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],g.top>c||g.bottom<c||(o={element:g.$item},g.$item.hasClass("parent")?(o.state="prepend",d.css("top",g.bottom-5)):g.top>c-12?(o.state="before",d.css("top",g.top-5)):(o.state="after",d.css("top",g.bottom-5)));$clone.css({top:c})}).bind("mouseup.st",function(b){var e,g;c=!1,a(document).unbind("mousemove.st mouseup.st"),f.css("opacity",""),$clone.remove(),d.remove(),g=a("<li />").height(f.height()),o&&(e=a(o.element),f.before(g),"prepend"==o.state?(e.find(">ul").length||e.find(">.side").after("<ul>"),e.find(">ul").prepend(f.hide())):e[o.state](f.hide()),f.slideDown(100,function(){f.removeClass("active")}),g.slideUp(100,function(){var a=g.parent();g.remove(),a.children("li").length||a.remove()}),f.trigger("dropped.st"))}),!1}},"mouseover.st":function(){return c||a(this).addClass("active"),!1},"mouseout.st":function(){return c||a(this).removeClass("active"),!1}}).find("li li").prepend('<button type="button" class="moveTo">Move to</button>').end().end(),a('<div id="dropzone-marker" />').css({display:"none",position:"absolute",backgroundColor:"#000",opacity:.7}).appendTo("body")});
--- a/modules/board/tpl/js/board_admin.min.js
+++ b/modules/board/tpl/js/board_admin.min.js
@ -1 +1 @@
-function completeInsertBoard(a){var b=(a.error,a.message),c=a.page,d=a.module_srl;alert(b);var e=current_url.setQuery("act","dispBoardAdminBoardInfo");d&&(e=e.setQuery("module_srl",d)),c&&e.setQuery("page",c),location.href=e}function completeDeleteBoard(a){var b=(a.error,a.message),c=a.page;alert(b);var d=current_url.setQuery("act","dispBoardAdminContent").setQuery("module_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function doUpdateCategory(a,b,c){if("undefined"==typeof c||confirm(c)){var d=xGetElementById("fo_category_info");d.category_srl.value=a,d.mode.value=b,procFilter(d,update_category)}}function completeUpdateCategory(a){var b=(a.error,a.message),c=a.module_srl,d=a.page;alert(b);var e=current_url.setQuery("module_srl",c).setQuery("act","dispBoardAdminCategoryInfo");d&&e.setQuery("page",d),location.href=e}function doCartSetup(a){var b=[];jQuery("#fo_list input[name=cart]:checked").each(function(){b[b.length]=jQuery(this).val()}),b.length<1||(a+="&module_srls="+b.join(","),popopen(a,"modulesSetup"))}function doInsertItem(){var a=xGetElementById("targetItem"),b=xGetElementById("displayItem");if(a&&b){for(var c=a.options[a.selectedIndex].text,d=a.options[a.selectedIndex].value,e=0;e<b.options.length;e++)if(b.options[e].value==d)return;var f=new Option(c,d,!0,!0);b.options[b.options.length]=f}}function doDeleteItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;0>b||a.options.length<2||(a.remove(b),a.selectedIndex=b-1)}function doMoveUpItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(1>b)&&b){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b-1].text,a.options[b].value=a.options[b-1].value,a.options[b-1].text=c,a.options[b-1].value=d,a.selectedIndex=b-1}}function doMoveDownItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(b>=a.options.length-1)){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b+1].text,a.options[b].value=a.options[b+1].value,a.options[b+1].text=c,a.options[b+1].value=d,a.selectedIndex=b+1}}function doSaveListConfig(a){if(a){for(var b=xGetElementById("displayItem"),c=(b.selectedIndex,[]),d=0;d<b.options.length;d++)c[c.length]=b.options[d].value;if(!(c.length<1)){var e={};e.module_srl=a,e.list=c.join(",");{new Array("error","message")}exec_json("board.procBoardAdminInsertListConfig",e,function(){location.reload()})}}}
+function completeInsertBoard(a){var b=(a.error,a.message),c=a.page,d=a.module_srl;alert(b);var e=current_url.setQuery("act","dispBoardAdminBoardInfo");d&&(e=e.setQuery("module_srl",d)),c&&e.setQuery("page",c),location.href=e}function completeDeleteBoard(a){var b=(a.error,a.message),c=a.page;alert(b);var d=current_url.setQuery("act","dispBoardAdminContent").setQuery("module_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function doUpdateCategory(a,b,c){if("undefined"==typeof c||confirm(c)){var d=xGetElementById("fo_category_info");d.category_srl.value=a,d.mode.value=b,procFilter(d,update_category)}}function completeUpdateCategory(a){var b=(a.error,a.message),c=a.module_srl,d=a.page;alert(b);var e=current_url.setQuery("module_srl",c).setQuery("act","dispBoardAdminCategoryInfo");d&&e.setQuery("page",d),location.href=e}function doCartSetup(a){var b=[];jQuery("#fo_list input[name=cart]:checked").each(function(){b[b.length]=jQuery(this).val()}),b.length<1||(a+="&module_srls="+b.join(","),popopen(a,"modulesSetup"))}function doInsertItem(){var a=xGetElementById("targetItem"),b=xGetElementById("displayItem");if(a&&b){for(var c=a.options[a.selectedIndex].text,d=a.options[a.selectedIndex].value,e=0;e<b.options.length;e++)if(b.options[e].value==d)return;var f=new Option(c,d,!0,!0);b.options[b.options.length]=f}}function doDeleteItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;0>b||a.options.length<2||(a.remove(b),a.selectedIndex=b-1)}function doMoveUpItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(1>b)&&b){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b-1].text,a.options[b].value=a.options[b-1].value,a.options[b-1].text=c,a.options[b-1].value=d,a.selectedIndex=b-1}}function doMoveDownItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(b>=a.options.length-1)){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b+1].text,a.options[b].value=a.options[b+1].value,a.options[b+1].text=c,a.options[b+1].value=d,a.selectedIndex=b+1}}function doSaveListConfig(a){if(a){for(var b=xGetElementById("displayItem"),c=(b.selectedIndex,[]),d=0;d<b.options.length;d++)c[c.length]=b.options[d].value;if(!(c.length<1)){var e={};e.module_srl=a,e.list=c.join(",");new Array("error","message");exec_json("board.procBoardAdminInsertListConfig",e,function(){location.reload()})}}}
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@ -54,7 +54,9 @@ class commentController extends comment
 		}

 		$point = 1;
-		return $this->updateVotedCount($comment_srl, $point);
+		$output = $this->updateVotedCount($comment_srl, $point);
+		$this->add('voted_count', $output->get('voted_count'));
+		return $output;
 	}

 	/**
@ -90,7 +92,9 @@ class commentController extends comment
 		}

 		$point = -1;
-		return $this->updateVotedCount($comment_srl, $point);
+		$output = $this->updateVotedCount($comment_srl, $point);
+		$this->add('blamed_count', $output->get('blamed_count'));
+		return $output;
 	}

 	/**
@ -637,10 +641,16 @@ class commentController extends comment
 	 * Fix the comment
 	 * @param object $obj
 	 * @param bool $is_admin
+	 * @param bool $manual_updated
 	 * @return object
 	 */
-	function updateComment($obj, $is_admin = FALSE)
+	function updateComment($obj, $is_admin = FALSE, $manual_updated = FALSE)
 	{
+		if(!$manual_updated && !checkCSRF())
+		{
+			return new Object(-1, 'msg_invalid_request');
+		}
+
 		if(!is_object($obj))
 		{
 			$obj = new stdClass();
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@ -543,6 +543,11 @@ class commentItem extends Object
 			return;
 		}

+		if($this->isSecret() && !$this->isGranted())
+		{
+			return;
+		}
+
 		// If signiture height setting is omitted, create a square
 		if(!$height)
 		{
@ -587,30 +592,33 @@ class commentItem extends Object
 		if($this->hasUploadedFiles())
 		{
 			$file_list = $this->getUploadedFiles();
-			if(count($file_list))
-			{
-				foreach($file_list as $file)
-				{
-					if($file->direct_download != 'Y')
-					{
-						continue;
-					}
-					if(!preg_match("/\.(jpg|png|jpeg|gif|bmp)$/i", $file->source_filename))
-					{
-						continue;
-					}

+			$first_image = null;
+			foreach($file_list as $file)
+			{
+				if($file->direct_download !== 'Y') continue;
+
+				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
+				{
 					$source_file = $file->uploaded_filename;
-					if(!file_exists($source_file))
+					break;
+				}
+
+				if($first_image) continue;
+
+				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
+				{
+					if(file_exists($file->uploaded_filename))
 					{
-						$source_file = NULL;
-					}
-					else
-					{
-						break;
+						$first_image = $file->uploaded_filename;
 					}
 				}
 			}
+
+			if(!$source_file && $first_image)
+			{
+				$source_file = $first_image;
+			}
 		}

 		// get an image file from the doc content if no file attached. 
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@ -868,7 +868,7 @@ class documentController extends document
 		$output = executeQuery('document.updateReadedCount', $args);

 		// Call a trigger when the read count is updated (after)
-		$outptrigger_outputut = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
+		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
 		if(!$trigger_output->toBool())
 		{
 			$oDB->rollback();
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@ -651,7 +651,7 @@ class documentItem extends Object
 	function getExtraValue($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		return $extra_vars[$idx]->value;
+		return $extra_vars[$idx]->getValue();
 	}

 	function getExtraValueHTML($idx)
@ -679,7 +679,7 @@ class documentItem extends Object
 				$extra_eid[$key->eid] = $key;
 			}
 		}
-		return $extra_eid[$eid]->value;
+		return $extra_eid[$eid]->getValue();
 	}

 	function getExtraEidValueHTML($eid)
@ -773,6 +773,12 @@ class documentItem extends Object
 	{
 		// Return false if the document doesn't exist
 		if(!$this->document_srl) return;
+
+		if($this->isSecret() && !$this->isGranted())
+		{
+			return;
+		}
+
 		// If not specify its height, create a square
 		if(!$height) $height = $width;
 		// Return false if neither attachement nor image files in the document
@ -799,27 +805,44 @@ class documentItem extends Object
 			if(filesize($thumbnail_file)<1) return false;
 			else return $thumbnail_url;
 		}
+
 		// Target File
 		$source_file = null;
 		$is_tmp_file = false;
-		// Find an iamge file among attached files if exists
-		if($this->get('uploaded_count'))
-		{
-			$oFileModel = getModel('file');
-			$file_list = $oFileModel->getFiles($this->document_srl, array(), 'file_srl', true);
-			if(count($file_list))
-			{
-				foreach($file_list as $file)
-				{
-					if($file->direct_download!='Y') continue;
-					if(!preg_match("/\.(jpg|png|jpeg|gif|bmp)$/i",$file->source_filename)) continue;

+		// Find an iamge file among attached files if exists
+		if($this->hasUploadedFiles())
+		{
+			$file_list = $this->getUploadedFiles();
+
+			$first_image = null;
+			foreach($file_list as $file)
+			{
+				if($file->direct_download !== 'Y') continue;
+
+				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
+				{
 					$source_file = $file->uploaded_filename;
-					if(!file_exists($source_file)) $source_file = null;
-					else break;
+					break;
+				}
+
+				if($first_image) continue;
+
+				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
+				{
+					if(file_exists($file->uploaded_filename))
+					{
+						$first_image = $file->uploaded_filename;
+					}
 				}
 			}
+
+			if(!$source_file && $first_image)
+			{
+				$source_file = $first_image;
+			}
 		}
+
 		// If not exists, file an image file from the content
 		if(!$source_file)
 		{
--- a/modules/editor/components/image_gallery/tpl/gallery.min.js
+++ b/modules/editor/components/image_gallery/tpl/gallery.min.js
@ -1 +1 @@
-!function(a){var b=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(a,b){var c=b[0],d=b[1],e="@"+c;/^files/.test(d)&&(d=request_uri+d),is_def(this._imgs[e])||(this._imgs[e]=[]),this._imgs[e].push({path:d,loaded:!1})},API_ONREADY:function(){var b,c,d,e,f=this._imgs;for(d in f)if(f.hasOwnProperty(d))for(b=0,c=f[d].length;c>b;b++)e=f[d][b],e.$obj=a("<img />").attr("src",e.path),e.$obj.load({img:e},function(a){var b=a.data.img;b.loaded=!0,b.$obj.unbind("load")})},API_GET_IMAGES:function(a,b){var c=b[0];return this._imgs["@"+c]||[]},API_SET_STYLE:function(a,b){var c=b[0],d=b[1];this._styles["@"+c]=d},API_ONLOAD:function(){var a,b;for(a in this._imgs)this._imgs.hasOwnProperty(a)&&(b=this._styles[a]||"list",this.cast("SHOW_"+b.toUpperCase(),[a.substr(1)]))}});xe.registerApp(new b)}(jQuery);
+!function(a){var b=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(a,b){var c=b[0],d=b[1],e="@"+c;/^files/.test(d)&&(d=request_uri+d),is_def(this._imgs[e])||(this._imgs[e]=[]),this._imgs[e].push({path:d,loaded:!1})},API_ONREADY:function(b,c){var d,e,f,g,h=this._imgs;for(f in h)if(h.hasOwnProperty(f))for(d=0,e=h[f].length;e>d;d++)g=h[f][d],g.$obj=a("<img />").attr("src",g.path),g.$obj.load({img:g},function(a){var b=a.data.img;b.loaded=!0,b.$obj.unbind("load")})},API_GET_IMAGES:function(a,b){var c=b[0];return this._imgs["@"+c]||[]},API_SET_STYLE:function(a,b){var c=b[0],d=b[1];this._styles["@"+c]=d},API_ONLOAD:function(){var a,b;for(a in this._imgs)this._imgs.hasOwnProperty(a)&&(b=this._styles[a]||"list",this.cast("SHOW_"+b.toUpperCase(),[a.substr(1)]))}});xe.registerApp(new b)}(jQuery);
--- a/modules/editor/components/image_gallery/tpl/popup.min.js
+++ b/modules/editor/components/image_gallery/tpl/popup.min.js
@ -1 +1 @@
-function getSlideShow(){var a,b,c,d,e,f,g,h,i="";if("undefined"!=typeof opener){a=opener.editorPrevNode,b=jQuery(a),b.is("img")&&(selected_node=a,c=b.width(),d=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",f=b.attr("border_color"),g=b.attr("bg_color"),h=b.attr("border_thickness")||1,get_by_id("width").value=c,get_by_id("gallery_style").selectedIndex="list"==d?1:0,get_by_id("gallery_align").selectedIndex="left"==e?1:"right"==e?2:0,get_by_id("border_thickness").value=h,get_by_id("border_color_input").value=f,get_by_id("bg_color_input").value=g,i=b.attr("images_list"));var j=get_by_id("fo"),k=j.editor_sequence.value,l=get_by_id("image_list");jQuery.exec_json("file.getFileList",{editor_sequence:k},function(a){jQuery.each(a.files,function(a,b){var c=b.file_srl;if(c){var d=b.source_filename;if(/\.(jpe?g|png|gif)$/i.test(d)){var e=!1;-1!=i.indexOf(d)&&(e=!0);var f=new Option(b.source_filename,c,!1,e);l.options.add(f),files[b.file_srl]=b}}})})}}function insertSlideShow(){if("undefined"!=typeof opener){for(var a=new Array,b=get_by_id("image_list"),c=0;c<b.length;c++){var d=b.options[c];if(d.selected){var e=d.value,f=files[e],g=f.download_url.replace(request_uri,"");a[a.length]=g}}if(!a.length)return void window.close();for(var h=get_by_id("width").value,i=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,j=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,k=get_by_id("border_thickness").value,l=get_by_id("border_color_input").value,m=get_by_id("bg_color_input").value,n="",c=0;c<a.length;c++)n+=a[c].trim()+" ";if(selected_node)selected_node.setAttribute("width",h),selected_node.setAttribute("gallery_style",i),selected_node.setAttribute("align",j),selected_node.setAttribute("gallery_align",j),selected_node.setAttribute("border_thickness",k),selected_node.setAttribute("border_color",l),selected_node.setAttribute("bg_color",m),selected_node.setAttribute("images_list",n),selected_node.style.width=h+"px";else{var o='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+h+'" gallery_style="'+i+'" align="'+j+'" gallery_align="'+j+'" border_thickness="'+k+'" border_color="'+l+'" bg_color="'+m+'" style="width:'+h+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+n+'" />';opener.editorFocus(opener.editorPrevSrl);var p=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(p,o)}opener.editorFocus(opener.editorPrevSrl),window.close()}}function select_color(a,b){get_by_id(a+"_preview_color").style.backgroundColor="#"+b,get_by_id(a+"_color_input").value=b}var selected_node=null,files=[];jQuery(function(){getSlideShow()});
+function getSlideShow(){var a,b,c,d,e,f,g,h,i="";if("undefined"!=typeof opener){a=opener.editorPrevNode,b=jQuery(a),b.is("img")&&(selected_node=a,c=b.width(),d=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",f=b.attr("border_color"),g=b.attr("bg_color"),h=b.attr("border_thickness")||1,get_by_id("width").value=c,get_by_id("gallery_style").selectedIndex="list"==d?1:0,get_by_id("gallery_align").selectedIndex="left"==e?1:"right"==e?2:0,get_by_id("border_thickness").value=h,get_by_id("border_color_input").value=f,get_by_id("bg_color_input").value=g,i=b.attr("images_list"));var j=get_by_id("fo"),k=j.editor_sequence.value,l=get_by_id("image_list");jQuery.exec_json("file.getFileList",{editor_sequence:k},function(a){jQuery.each(a.files,function(a,b){var c=b.file_srl;if(c){var d=b.source_filename;if(/\.(jpe?g|png|gif)$/i.test(d)){var e=!1;-1!=i.indexOf(d)&&(e=!0);var f=new Option(b.source_filename,c,!1,e);l.options.add(f),files[b.file_srl]=b}}})})}}function insertSlideShow(){if("undefined"!=typeof opener){for(var a=new Array,b=get_by_id("image_list"),c=0;c<b.length;c++){var d=b.options[c];if(d.selected){var e=d.value,f=files[e],g=f.download_url.replace(request_uri,"");a[a.length]=g}}if(!a.length)return void window.close();for(var h=get_by_id("width").value,i=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,j=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,k=get_by_id("border_thickness").value,l=get_by_id("border_color_input").value,m=get_by_id("bg_color_input").value,n="",c=0;c<a.length;c++)n+=a[c].trim()+" ";if(selected_node)selected_node.setAttribute("width",h),selected_node.setAttribute("gallery_style",i),selected_node.setAttribute("align",j),selected_node.setAttribute("gallery_align",j),selected_node.setAttribute("border_thickness",k),selected_node.setAttribute("border_color",l),selected_node.setAttribute("bg_color",m),selected_node.setAttribute("images_list",n),selected_node.style.width=h+"px";else{var o='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+h+'" gallery_style="'+i+'" align="'+j+'" gallery_align="'+j+'" border_thickness="'+k+'" border_color="'+l+'" bg_color="'+m+'" style="width:'+h+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+n+'" />';opener.editorFocus(opener.editorPrevSrl);var p=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(p,o)}opener.editorFocus(opener.editorPrevSrl),window.close()}}function select_color(a,b){get_by_id(a+"_preview_color").style.backgroundColor="#"+b,get_by_id(a+"_color_input").value=b}var selected_node=null,files=[];jQuery(function(a){getSlideShow()});
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@ -18,8 +18,8 @@
 		<div class="x_control-group">
 			<label for="" class="x_control-label">{$lang->poll_stop_date}</label>
 			<div class="x_controls">
-				<input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*30)}" />
-				<input type="date" class="inputDate" value="{date('Y-m-d',time()+60*60*24*30)}" />
+				<input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*7)}" />
+				<input type="date" class="inputDate" value="{date('Y-m-d',time()+60*60*24*7)}" />
 <script>
 (function($){
 $(function(){
@ -31,7 +31,7 @@ $(function(){
 		, onSelect:function(){
 			$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""));
 		}
-		,minDate: new Date("{date('Y-m-d',time()+60*60*24*30)}")
+		,minDate: new Date("{date('Y-m-d',time())}")
 	};
 	$.extend(option,$.datepicker.regional['{$lang_type}']);
 	$(".inputDate").datepicker(option);
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@ -550,8 +550,7 @@ class editorModel extends editor
 			if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Create an object after loading the class file
 			require_once($class_file);
-			$tmp_fn = create_function('$seq,$path', "return new {$component}(\$seq,\$path);");
-			$oComponent = $tmp_fn($editor_sequence, $class_path);
+			$oComponent = new $component($editor_sequence, $class_path);
 			if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
--- a/modules/editor/skins/ckeditor/css/default.css
+++ b/modules/editor/skins/ckeditor/css/default.css
@ -1,6 +0,0 @@
-.cke_button__xe_component_label {
-	display: inline !important;
-}
-.cke_button__xe_component_icon {
-	display: none !important;
-}
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@ -1,5 +1,6 @@
 <!-- css -->
 <load target="css/default.css" />
+<load target="../../../../common/xeicon/xeicon.min.css" />

 <!-- JS -->
 <!--%load_js_plugin("ckeditor")-->
@ -9,7 +10,7 @@

 {@ $css_content = null }
 <!--@if($content_font || $content_font_size)-->
-	{@ $css_content = '.xe_content.editable p { margin: 0;'. chr(125); }
+	<!--@if($content_style === 'ckeditor_light')-->{@ $css_content = '.xe_content.editable p { margin: 0;'. chr(125); }<!--@endif-->

 	{@ $css_content .= ' .xe_content.editable { '}
 	<block cond="$content_font">
@ -31,16 +32,17 @@
 <script>
 (function($){
 	"use strict";
-
 	// editor
 	$(function(){
+		<!--@if(!FileHandler::exists('common/js/plugins/ckeditor/ckeditor/config.js'))-->CKEDITOR.config.customConfig = '';<!--@endif-->
 		var settings = {
 			ckeconfig: {
 				height: '{$editor_height}',
 				skin: '{$colorset}',
 				contentsCss: '{$content_style_path}/editor.css',
 				xe_editor_sequence: {$editor_sequence},
-				toolbarCanCollapse: true
+				toolbarCanCollapse: true,
+				language: "{str_replace('jp','ja',$lang_type)}"
 			},
 			loadXeComponent: true,
 			enableToolbar: true,
@ -66,9 +68,13 @@
 			settings.loadXeComponent = false;
 		<!--@endif-->

-		<!--@if($module_type === 'comment')-->
+		<!--@if($module_type === 'comment'||Mobile::isMobileCheckByAgent())-->
 			settings.ckeconfig.toolbarStartupExpanded = false;
 		<!--@endif-->
+		
+		<!--@if(!$html_mode)-->
+			settings.ckeconfig.removeButtons = 'Save,Preview,Print,Cut,Copy,Paste,Source';
+		<!--@endif-->

 		<!--@if($css_content)-->CKEDITOR.addCss('{$css_content}');<!--@end-->

--- a/modules/editor/skins/ckeditor/file_upload.html
+++ b/modules/editor/skins/ckeditor/file_upload.html
@ -1,34 +1,32 @@
 <!--%load_js_plugin("jquery.fileupload")-->
 <!--%load_js_plugin("jquery.finderSelect")-->
 <!--%load_js_plugin("handlebars")-->
-
+<load target="./lang" />
 <div cond="$allow_fileupload" id="xefu-container-{$editor_sequence}" class="xefu-container xe-clearfix" data-editor-sequence="{$editor_sequence}">
 	<!--// dropzone -->
 	<div class="xefu-dropzone">
-		<p class="xefu-dropzone-message">여기에 파일을 끌어 놓거나 파일 첨부를 클릭하세요</p>
+		<span class="xefu-btn fileinput-button xefu-act-selectfile">
+			<span><i class="xi-icon xi-file-add"></i> {$lang->edit->upload_file}</span>
+			<input id="xe-fileupload" type="file" class="fileupload-processing " value="{$lang->edit->upload_file}" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple />
+		</span>

-		<div>
-			<span class="xefu-btn fileinput-button xefu-act-selectfile">
-				<span>{$lang->edit->upload_file}</span>
-				<input id="xe-fileupload" type="file" class="fileupload-processing " value="{$lang->edit->upload_file}" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple />
-			</span>
-		</div>
+		<p class="xefu-dropzone-message">{$lang->ckeditor_about_file_drop_area}</p>

-		<p>파일 크기 제한 : <span class="allowed_filesize">0MB</span> <span>(허용 확장자 : <span class="allowed_filetypes">*.*</span>)</span></p>
+		<p class="upload_info">{$lang->allowed_filesize} : <span class="allowed_filesize">0MB</span> <span>({$lang->allowed_filetypes} : <span class="allowed_filetypes">*.*</span>)</span></p>

-		<p class="xefu-progress-status" style="display: none;">파일 업로드 중... (<span class="xefu-progress-percent">0%</span>)</p>
+		<p class="xefu-progress-status" style="display: none;">{$lang->ckeditor_file_uploading} (<span class="xefu-progress-percent">0%</span>)</p>
 		<div class="xefu-progressbar" style="display: none;"><div></div></div>
 	</div>
 	<!--// END:dropzone -->

 	<div class="xefu-controll xe-clearfix">
 		<div style="float: left;">
-			<span class="file_count">0</span>개 첨부 됨 (<span class="attached_size"></span> / <span class="allowed_attach_size"></span>)
+			{$lang->ckeditor_file_count} (<span class="attached_size"></span> / <span class="allowed_attach_size"></span>)
 		</div>

 		<div style="float: right">
-			<input type="button" class="xefu-btn xefu-act-link-selected" style=" vertical-align: middle; vertical-align: middle;" value="본문삽입">
-			<input type="button" class="xefu-btn xefu-act-delete-selected" style=" vertical-align: middle; vertical-align: middle;" value="선택삭제">
+			<input type="button" class="xefu-btn xefu-act-link-selected" style=" vertical-align: middle; vertical-align: middle;" value="{$lang->edit->link_file}">
+			<input type="button" class="xefu-btn xefu-act-delete-selected" style=" vertical-align: middle; vertical-align: middle;" value="{$lang->edit->delete_selected}">
 		</div>
 	</div>

--- a/modules/editor/skins/ckeditor/lang/lang.xml
+++ b/modules/editor/skins/ckeditor/lang/lang.xml
@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="ckeditor_about_file_drop_area">
+		<value xml:lang="ko"><![CDATA[여기에 파일을 끌어 놓거나 파일 첨부 버튼을 클릭하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+		<value xml:lang="jp"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+		<value xml:lang="ru"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+		<value xml:lang="tr"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+		<value xml:lang="vi"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
+	</item>
+	<item name="ckeditor_file_uploading">
+		<value xml:lang="ko"><![CDATA[파일 업로드 중...]]></value>
+		<value xml:lang="en"><![CDATA[Uploading...]]></value>
+		<value xml:lang="jp"><![CDATA[Uploading...]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Uploading...]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Uploading...]]></value>
+		<value xml:lang="ru"><![CDATA[Uploading...]]></value>
+		<value xml:lang="tr"><![CDATA[Uploading...]]></value>
+		<value xml:lang="vi"><![CDATA[Uploading...]]></value>
+	</item>
+	<item name="ckeditor_file_count">
+		<value xml:lang="ko"><![CDATA[<span class="file_count">0</span>개 첨부 됨]]></value>
+		<value xml:lang="en"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+		<value xml:lang="jp"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+		<value xml:lang="zh-CN"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+		<value xml:lang="zh-TW"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+		<value xml:lang="ru"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+		<value xml:lang="tr"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+		<value xml:lang="vi"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
+	</item>
+</lang>
--- a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
+++ b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
--- a/modules/editor/styles/ckeditor_recommend/editor.css
+++ b/modules/editor/styles/ckeditor_recommend/editor.css
@ -0,0 +1,19 @@
+@charset "utf-8";
+/* NAVER (developers@xpressengine.com) */
+.xe_content.editable {color:#000;font-size:14px;font-family:sans-serif;line-height:1.6;word-break:break-all;word-wrap:break-word}
+.xe_content.editable img{border:0;max-width:100%;}
+.xe_content.editable blockquote.q1,
+.xe_content.editable blockquote.q2,
+.xe_content.editable blockquote.q3,
+.xe_content.editable blockquote.q4,
+.xe_content.editable blockquote.q5,
+.xe_content.editable blockquote.q6,
+.xe_content.editable blockquote.q7{padding:10px;margin:0 15px}
+.xe_content.editable blockquote.q1{padding:0 10px;border-left:2px solid #ccc}
+.xe_content.editable blockquote.q2{padding:0 10px;background:url(./img/bg_qmark.gif) no-repeat left top}
+.xe_content.editable blockquote.q3{border:1px solid #d9d9d9}
+.xe_content.editable blockquote.q4{border:1px solid #d9d9d9;background:#fbfbfb}
+.xe_content.editable blockquote.q5{border:2px solid #707070}
+.xe_content.editable blockquote.q6{border:1px dashed #707070}
+.xe_content.editable blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
+.xe_content.editable table .xe_selected_cell{background-color:#d6e9ff}
--- a/modules/editor/styles/ckeditor_recommend/editor.html
+++ b/modules/editor/styles/ckeditor_recommend/editor.html
@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<link rel="stylesheet" href="editor.css" />
+<title>XpressEngine</title>
+</head>
+<body class="xe_content editable">
+</body>
+</html>
--- a/modules/editor/styles/ckeditor_recommend/img/bg_qmark.gif
+++ b/modules/editor/styles/ckeditor_recommend/img/bg_qmark.gif
--- a/modules/editor/styles/ckeditor_recommend/skin.xml
+++ b/modules/editor/styles/ckeditor_recommend/skin.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+	<title xml:lang="ko">XE CKEditor 권장 서식</title>
+	<version>1.8</version>
+	<date>2014-02-27</date>
+	<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+		<name xml:lang="ko">NAVER</name>
+	</author>
+</skin>
--- a/modules/editor/styles/ckeditor_recommend/style.css
+++ b/modules/editor/styles/ckeditor_recommend/style.css
@ -0,0 +1,17 @@
+@charset "utf-8";
+/* NAVER (developers@xpressengine.com) */
+.xe_content {color:#000;font-size:14px;font-family:sans-serif;line-height:1.6}
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{padding:10px;margin:0 15px}
+.xe_content blockquote.q1{padding:0 10px;border-left:2px solid #ccc}
+.xe_content blockquote.q2{padding:0 10px;background:url(./img/bg_qmark.gif) no-repeat left top}
+.xe_content blockquote.q3{border:1px solid #d9d9d9}
+.xe_content blockquote.q4{border:1px solid #d9d9d9;background:#fbfbfb}
+.xe_content blockquote.q5{border:2px solid #707070}
+.xe_content blockquote.q6{border:1px dashed #707070}
+.xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
--- a/modules/editor/styles/ckeditor_recommend/style.ini
+++ b/modules/editor/styles/ckeditor_recommend/style.ini
@ -0,0 +1 @@
+style.css
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@ -74,7 +74,7 @@
 		<div class="x_control-group">
 			<label for="comment_editor_height" class="x_control-label">{$lang->guide_set_height_comment_editor}</label>
 			<div class="x_controls">
-				<input type="number" name="comment_editor_height"id="comment_editor_height" value="{$editor_config->comment_editor_height}"|cond="$editor_config->comment_editor_height" value="{$editor_config_default['comment_editor_height']}"|cond="!$editor_config->comment_editor_height" /> px
+				<input type="number" name="comment_editor_height" id="comment_editor_height" value="{$editor_config->comment_editor_height}"|cond="$editor_config->comment_editor_height" value="{$editor_config_default['comment_editor_height']}"|cond="!$editor_config->comment_editor_height" /> px
 			</div>
 		</div>
 		<div class="x_control-group">
@ -107,7 +107,6 @@
 					<input type="radio" name="font_defined" id="font_defined" value="Y" checked="checked"|cond="$editor_config->font_defined== 'Y'" />{$lang->by_you} : 
 					<input type="text" name="content_font_defined" value="{stripcslashes($editor_config->content_font)}"|cond="$editor_config->font_defined == 'Y'" />
 				</label>
-				<label>
 			</div>
 		</div>
 		<div class="x_control-group">
--- a/modules/editor/tpl/js/editor.app.min.js
+++ b/modules/editor/tpl/js/editor.app.min.js
@ -1 +1 @@
-!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.on("instanceCreated",function(){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){{var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence}this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){var a=new d;return a}}(jQuery);
+!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.on("instanceCreated",function(b){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(b){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(b){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(b){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence;this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){var a=new d;return a}}(jQuery);
--- a/modules/editor/tpl/js/editor.min.js
+++ b/modules/editor/tpl/js/editor.min.js
--- a/modules/editor/tpl/js/swfupload.min.js
+++ b/modules/editor/tpl/js/swfupload.min.js
--- a/modules/editor/tpl/js/uploader.min.js
+++ b/modules/editor/tpl/js/uploader.min.js
--- a/modules/file/conf/module.xml
+++ b/modules/file/conf/module.xml
@ -19,6 +19,7 @@
        <action name="procFileAdminInsertModuleConfig" type="controller" ruleset="fileModuleConfig" />
        <action name="procFileAdminAddCart" type="controller" />
        <action name="procFileGetList" type="controller" />
+        <action name="procFileSetCoverImage" type="controller" />
    </actions>
 	<menus>
 		<menu name="file">
--- a/modules/file/file.class.php
+++ b/modules/file/file.class.php
@ -78,6 +78,8 @@ class file extends ModuleObject
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;

+		if(!$oDB->isColumnExists('files', 'cover_image')) return true;
+
 		return false;
 	}

@ -139,6 +141,8 @@ class file extends ModuleObject
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after');
 		}

+		if(!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
+
 		return new Object(0, 'success_updated');
 	}

--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@ -935,6 +935,52 @@ class fileController extends file
 		}
 	}

+	public function procFileSetCoverImage()
+	{
+		$vars = Context::getRequestVars();
+		$logged_info = Context::get('logged_info');
+
+		if(!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
+
+		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
+
+		$oFileModel = getModel('file');
+		$file_info = $oFileModel->getFile($vars->file_srl);
+
+		if(!$file_info) return new Object(-1, 'msg_not_founded');
+
+		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+
+		$args =  new stdClass();
+		$args->file_srl = $vars->file_srl;
+		$args->upload_target_srl = $upload_target_srl;
+
+		$oDB = &DB::getInstance();
+		$oDB->begin();
+
+		$args->cover_image = 'N';
+		$output = executeQuery('file.updateClearCoverImage', $args);
+		if(!$output->toBool())
+		{
+			$oDB->rollback();
+			return $output;
+		}
+
+		$args->cover_image = 'Y';
+		$output = executeQuery('file.updateCoverImage', $args);
+		if(!$output->toBool())
+		{
+			$oDB->rollback();
+			return $output;
+		}
+
+		$oDB->commit();
+
+		// 썸네일 삭제
+		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($upload_target_srl, 3));
+		Filehandler::removeFilesInDir($thumbnail_path);
+	}
+
 	/**
 	 * Find the attachment where a key is upload_target_srl and then return java script code
 	 *
@ -965,3 +1011,4 @@ class fileController extends file
 }
 /* End of file file.controller.php */
 /* Location: ./modules/file/file.controller.php */
+
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@ -49,6 +49,7 @@ class fileModel extends file
 				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
+				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$files[] = $obj;
 				$attached_size += $file_info->file_size;
 			}
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				jQuery.easing.jswing=jQuery.easing.swing,jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(a,b,c,d,e){return jQuery.easing[jQuery.easing.def](a,b,c,d,e)},easeInQuad:function(a,b,c,d,e){return d(b/=e)b+c},easeOutQuad:function(a,b,c,d,e){return-d(b/=e)(b-2)+c},easeInOutQuad:function(a,b,c,d,e){return(b/=e/2)<1?d/2bb+c:-d/2(--b(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d(b/=e)bb+c},easeOutCubic:function(a,b,c,d,e){return d((b=b/e-1)bb+1)+c},easeInOutCubic:function(a,b,c,d,e){return(b/=e/2)<1?d/2bbb+c:d/2((b-=2)bb+2)+c},easeInQuart:function(a,b,c,d,e){return d(b/=e)bbb+c},easeOutQuart:function(a,b,c,d,e){return-d((b=b/e-1)bbb-1)+c},easeInOutQuart:function(a,b,c,d,e){return(b/=e/2)<1?d/2bbbb+c:-d/2((b-=2)bbb-2)+c},easeInQuint:function(a,b,c,d,e){return d(b/=e)bbbb+c},easeOutQuint:function(a,b,c,d,e){return d((b=b/e-1)bbbb+1)+c},easeInOutQuint:function(a,b,c,d,e){return(b/=e/2)<1?d/2bbbbb+c:d/2((b-=2)bbbb+2)+c},easeInSine:function(a,b,c,d,e){return-dMath.cos(b/e(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return dMath.sin(b/e(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2(Math.cos(Math.PIb/e)-1)+c},easeInExpo:function(a,b,c,d,e){return 0==b?c:dMath.pow(2,10(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d(-Math.pow(2,-10b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){return 0==b?c:b==e?c+d:(b/=e/2)<1?d/2Math.pow(2,10(b-1))+c:d/2(-Math.pow(2,-10--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d(Math.sqrt(1-(b/=e)b)-1)+c},easeOutCirc:function(a,b,c,d,e){return dMath.sqrt(1-(b=b/e-1)b)+c},easeInOutCirc:function(a,b,c,d,e){return(b/=e/2)<1?-d/2(Math.sqrt(1-bb)-1)+c:d/2(Math.sqrt(1-(b-=2)b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(1==(b/=e))return c+d;if(g\|\|(g=.3e),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2Math.PI)Math.asin(d/h);return-(hMath.pow(2,10(b-=1))Math.sin(2(be-f)Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(1==(b/=e))return c+d;if(g\|\|(g=.3e),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2Math.PI)Math.asin(d/h);return hMath.pow(2,-10b)Math.sin(2(be-f)Math.PI/g)+d+c},easeInOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(2==(b/=e/2))return c+d;if(g\|\|(g=.3e1.5),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2Math.PI)Math.asin(d/h);return 1>b?-.5hMath.pow(2,10(b-=1))Math.sin(2(be-f)Math.PI/g)+c:hMath.pow(2,-10(b-=1))Math.sin(2(be-f)Math.PI/g).5+d+c},easeInBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),d(b/=e)b((f+1)b-f)+c},easeOutBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),d((b=b/e-1)b((f+1)b+f)+1)+c},easeInOutBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),(b/=e/2)<1?d/2bb(((f=1.525)+1)b-f)+c:d/2((b-=2)b(((f=1.525)+1)b+f)+2)+c},easeInBounce:function(a,b,c,d,e){return d-jQuery.easing.easeOutBounce(a,e-b,0,d,e)+c},easeOutBounce:function(a,b,c,d,e){return(b/=e)<1/2.75?7.5625dbb+c:2/2.75>b?d(7.5625(b-=1.5/2.75)b+.75)+c:2.5/2.75>b?d(7.5625(b-=2.25/2.75)b+.9375)+c:d(7.5625(b-=2.625/2.75)b+.984375)+c},easeInOutBounce:function(a,b,c,d,e){return e/2>b?.5jQuery.easing.easeInBounce(a,2b,0,d,e)+c:.5jQuery.easing.easeOutBounce(a,2b-e,0,d,e)+.5*d+c}});