diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000000000..5f00d3da3
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,9 @@
+common/js/jquery*.js
+common/js/modernizr.js
+common/js/xe.js
+common/js/x.js
+common/js/*.min.js
+common/js/unittest/*
+common/js/plugins/*
+common/js/foggyLayer.js
+common/js/html5.js
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000000000..ae1b55f2c
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,68 @@
+{
+	"globalstrict": false,
+	"undef": false,
+	"eqeqeq": false,
+	"browser": true,
+	"devel": true,
+	"jquery": true,
+	"evil": true,
+	"globals": {
+		"window": true,
+		"current_url": true,
+		"exec_json": true,
+		"exec_xml": true,
+		"procFilter": true,
+		"xe": true,
+		"request_uri": true,
+		"xAddEventListener": false,
+		"xResizeEvent": false,
+		"xScrollEvent": false,
+		"xAppendChild": false,
+		"xClientHeight": false,
+		"xClientWidth": false,
+		"xCreateElement": false,
+		"xDef": false,
+		"xDeleteCookie": false,
+		"xDisplay": false,
+		"xEvent": false,
+		"xFirstChild": false,
+		"xGetBodyWidth": false,
+		"xGetBodyHeight": false,
+		"xGetComputedStyle": false,
+		"xGetCookie": false,
+		"xGetElementById": false,
+		"xGetElementsByAttribute": false,
+		"xGetElementsByClassName": false,
+		"xGetElementsByTagName": false,
+		"xGetURLArguments": false,
+		"xHeight": false,
+		"xHex": false,
+		"xHide": false,
+		"xInnerHtml": false,
+		"xLeft": false,
+		"xMoveTo": false,
+		"xName": false,
+		"xNextSib": false,
+		"xNum": false,
+		"xOffsetLeft": false,
+		"xOffsetTop": false,
+		"xPad": false,
+		"xPageX": false,
+		"xPageY": false,
+		"xParent": false,
+		"xPreventDefault": false,
+		"xPrevSib": false,
+		"xRemoveEventListener": false,
+		"xResizeTo": false,
+		"xScrollLeft": false,
+		"xScrollTop": false,
+		"xSetCookie": false,
+		"xShow": false,
+		"xStr": false,
+		"xTop": false,
+		"xVisibility": false,
+		"xWidth": false,
+		"xZIndex": false,
+		"xStopPropagation": false
+	}
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 9b9f7a502..2adb308a0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -172,15 +172,6 @@ module.exports = function(grunt) {
 				'modules/widget/tpl/js/*.js',
 			],
 			options : {
-				globalstrict: false,
-				undef : false,
-				eqeqeq: false,
-				browser : true,
-				globals: {
-					"jQuery" : true,
-					"console" : true,
-					"window" : true
-				},
 				ignores : [
 					'**/jquery*.js',
 					'**/swfupload.js',
diff --git a/addons/oembed/jquery.oembed.js b/addons/oembed/jquery.oembed.js
index 41f9d4509..dd17f4841 100755
--- a/addons/oembed/jquery.oembed.js
+++ b/addons/oembed/jquery.oembed.js
@@ -781,12 +781,6 @@
 				from: 'htmlstring'
 			}
 		}),
-		new $.fn.oembed.OEmbedProvider("gravtar", "photo", ["mailto:.+"], null, {
-			templateRegex: /mailto:([^\/]+).*/,
-			template: function (wm, email) {
-				return '<img src="http://gravatar.com/avatar/' + email.md5() + '.jpg" alt="on Gravtar" class="jqoaImg">';
-			}
-		}),
 
 		//Rich
 		new $.fn.oembed.OEmbedProvider("twitter", "rich", ["twitter.com/.+"], "https://api.twitter.com/1/statuses/oembed.json"),
@@ -1062,137 +1056,3 @@
 		})
 	];
 })(jQuery);
-
-//This is needed for gravatar :(
-String.prototype.md5 = function () {
-	var a = function (a, b) {
-		var c = (a & 65535) + (b & 65535);
-		var d = (a >> 16) + (b >> 16) + (c >> 16);
-		return d << 16 | c & 65535
-	};
-	var b = function (a, b) {
-		return a << b | a >>> 32 - b
-	};
-	var c = function (c, d, e, f, g, h) {
-		return a(b(a(a(d, c), a(f, h)), g), e)
-	};
-	var d = function (a, b, d, e, f, g, h) {
-		return c(b & d | ~b & e, a, b, f, g, h)
-	};
-	var e = function (a, b, d, e, f, g, h) {
-		return c(b & e | d & ~e, a, b, f, g, h)
-	};
-	var f = function (a, b, d, e, f, g, h) {
-		return c(b ^ d ^ e, a, b, f, g, h)
-	};
-	var g = function (a, b, d, e, f, g, h) {
-		return c(d ^ (b | ~e), a, b, f, g, h)
-	};
-	var h = function (b) {
-		var c, h, i, j, k, l = b.length;
-		var m = 1732584193;
-		var n = -271733879;
-		var o = -1732584194;
-		var p = 271733878;
-		for(k = 0; k < l; k += 16) {
-			c = m;
-			h = n;
-			i = o;
-			j = p;
-			m = d(m, n, o, p, b[k + 0], 7, -680876936);
-			p = d(p, m, n, o, b[k + 1], 12, -389564586);
-			o = d(o, p, m, n, b[k + 2], 17, 606105819);
-			n = d(n, o, p, m, b[k + 3], 22, -1044525330);
-			m = d(m, n, o, p, b[k + 4], 7, -176418897);
-			p = d(p, m, n, o, b[k + 5], 12, 1200080426);
-			o = d(o, p, m, n, b[k + 6], 17, -1473231341);
-			n = d(n, o, p, m, b[k + 7], 22, -45705983);
-			m = d(m, n, o, p, b[k + 8], 7, 1770035416);
-			p = d(p, m, n, o, b[k + 9], 12, -1958414417);
-			o = d(o, p, m, n, b[k + 10], 17, -42063);
-			n = d(n, o, p, m, b[k + 11], 22, -1990404162);
-			m = d(m, n, o, p, b[k + 12], 7, 1804603682);
-			p = d(p, m, n, o, b[k + 13], 12, -40341101);
-			o = d(o, p, m, n, b[k + 14], 17, -1502002290);
-			n = d(n, o, p, m, b[k + 15], 22, 1236535329);
-			m = e(m, n, o, p, b[k + 1], 5, -165796510);
-			p = e(p, m, n, o, b[k + 6], 9, -1069501632);
-			o = e(o, p, m, n, b[k + 11], 14, 643717713);
-			n = e(n, o, p, m, b[k + 0], 20, -373897302);
-			m = e(m, n, o, p, b[k + 5], 5, -701558691);
-			p = e(p, m, n, o, b[k + 10], 9, 38016083);
-			o = e(o, p, m, n, b[k + 15], 14, -660478335);
-			n = e(n, o, p, m, b[k + 4], 20, -405537848);
-			m = e(m, n, o, p, b[k + 9], 5, 568446438);
-			p = e(p, m, n, o, b[k + 14], 9, -1019803690);
-			o = e(o, p, m, n, b[k + 3], 14, -187363961);
-			n = e(n, o, p, m, b[k + 8], 20, 1163531501);
-			m = e(m, n, o, p, b[k + 13], 5, -1444681467);
-			p = e(p, m, n, o, b[k + 2], 9, -51403784);
-			o = e(o, p, m, n, b[k + 7], 14, 1735328473);
-			n = e(n, o, p, m, b[k + 12], 20, -1926607734);
-			m = f(m, n, o, p, b[k + 5], 4, -378558);
-			p = f(p, m, n, o, b[k + 8], 11, -2022574463);
-			o = f(o, p, m, n, b[k + 11], 16, 1839030562);
-			n = f(n, o, p, m, b[k + 14], 23, -35309556);
-			m = f(m, n, o, p, b[k + 1], 4, -1530992060);
-			p = f(p, m, n, o, b[k + 4], 11, 1272893353);
-			o = f(o, p, m, n, b[k + 7], 16, -155497632);
-			n = f(n, o, p, m, b[k + 10], 23, -1094730640);
-			m = f(m, n, o, p, b[k + 13], 4, 681279174);
-			p = f(p, m, n, o, b[k + 0], 11, -358537222);
-			o = f(o, p, m, n, b[k + 3], 16, -722521979);
-			n = f(n, o, p, m, b[k + 6], 23, 76029189);
-			m = f(m, n, o, p, b[k + 9], 4, -640364487);
-			p = f(p, m, n, o, b[k + 12], 11, -421815835);
-			o = f(o, p, m, n, b[k + 15], 16, 530742520);
-			n = f(n, o, p, m, b[k + 2], 23, -995338651);
-			m = g(m, n, o, p, b[k + 0], 6, -198630844);
-			p = g(p, m, n, o, b[k + 7], 10, 1126891415);
-			o = g(o, p, m, n, b[k + 14], 15, -1416354905);
-			n = g(n, o, p, m, b[k + 5], 21, -57434055);
-			m = g(m, n, o, p, b[k + 12], 6, 1700485571);
-			p = g(p, m, n, o, b[k + 3], 10, -1894986606);
-			o = g(o, p, m, n, b[k + 10], 15, -1051523);
-			n = g(n, o, p, m, b[k + 1], 21, -2054922799);
-			m = g(m, n, o, p, b[k + 8], 6, 1873313359);
-			p = g(p, m, n, o, b[k + 15], 10, -30611744);
-			o = g(o, p, m, n, b[k + 6], 15, -1560198380);
-			n = g(n, o, p, m, b[k + 13], 21, 1309151649);
-			m = g(m, n, o, p, b[k + 4], 6, -145523070);
-			p = g(p, m, n, o, b[k + 11], 10, -1120210379);
-			o = g(o, p, m, n, b[k + 2], 15, 718787259);
-			n = g(n, o, p, m, b[k + 9], 21, -343485551);
-			m = a(m, c);
-			n = a(n, h);
-			o = a(o, i);
-			p = a(p, j)
-		}
-		return [m, n, o, p]
-	};
-	var i = function (a) {
-		var b = "0123456789abcdef",
-			c = "",
-			d, e = a.length * 4;
-		for(d = 0; d < e; d++) {
-			c += b.charAt(a[d >> 2] >> d % 4 * 8 + 4 & 15) + b.charAt(a[d >> 2] >> d % 4 * 8 & 15)
-		}
-		return c
-	};
-	var j = function (a) {
-		var b = (a.length + 8 >> 6) + 1;
-		var c = [],
-			d, e = b * 16,
-			f, g = a.length;
-		for(d = 0; d < e; d++) {
-			c.push(0)
-		}
-		for(f = 0; f < g; f++) {
-			c[f >> 2] |= (a.charCodeAt(f) & 255) << f % 4 * 8
-		}
-		c[f >> 2] |= 128 << f % 4 * 8;
-		c[b * 16 - 2] = g * 8;
-		return c
-	};
-	return i(h(j(this)))
-}
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 93ea4427d..ed15074c5 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -297,7 +297,7 @@ class ExtraItem
 				return ($value) ? sprintf('<a href="mailto:%s">%s</a>', $value, $value) : "";
 
 			case 'tel' :
-				return sprintf('%s - %s - %s', $value[0], $value[1], $value[2]);
+				return sprintf('%s-%s-%s', $value[0], $value[1], $value[2]);
 				
 			case 'textarea' :
 				return nl2br($value);
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 4c9baaa6e..7d6b7a800 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -248,6 +248,9 @@ class adminAdminView extends admin
 	 */
 	function dispAdminIndex()
 	{
+		$db_info = Context::getDBInfo();
+		Context::set('db_info',$db_info);
+
 		// Get statistics
 		$args = new stdClass();
 		$args->date = date("Ymd000000", $_SERVER['REQUEST_TIME'] - 60 * 60 * 24);
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index aad7294c4..ed6277a3b 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -1606,4 +1606,11 @@
 		<value xml:lang="en"><![CDATA[Your IP]]></value>
 		<value xml:lang="jp"><![CDATA[接続したIP]]></value>
 	</item>
+	<item name="sitelock_in_use">
+		<value xml:lang="ko"><![CDATA[사이트 잠금을 사용중입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Site lock in use]]></value>
+	</item>
+	<item name="about_sitelock_in_use">
+		<value xml:lang="ko"><![CDATA[관리자 페이지에서 허용한 IP를 제외한 사용자는 접속할 수 없습니다.]]></value>
+	</item>
 </lang>
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index 15f754e49..04c73e0a3 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -19,6 +19,11 @@
 		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
 
+	<div class="message error" cond="$db_info->use_sitelock == 'Y'">
+		<h2>{$lang->sitelock_in_use}</h2>
+		<p>{$lang->about_sitelock_in_use}</p>
+	</div>
+
 	<form action="./" method="post" class="message info x_clearfix" cond="!$isLicenseAgreement">
 		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
 		<input type="hidden" name="module" value="install" />