From 8a6765faeb7d85b10f30e30de539d307b50649a5 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Fri, 1 Jul 2016 01:50:11 +0300
Subject: [PATCH] Fix eslint version

---
 .eslintrc.js                            | 137 +++---
 dev/App/Abstract.jsx                    |   4 +-
 dev/Common/HtmlEditor.jsx               |   2 +
 dev/Common/Selector.jsx                 |   2 +
 dev/External/ko.js                      |   1 +
 dev/Settings/Admin/Security.js          |   2 +
 dev/Stores/User/Pgp.js                  |   4 +-
 dev/View/Popup/Compose.js               |   4 +
 dev/View/Popup/Contacts.js              |   2 +
 dev/View/Popup/KeyboardShortcutsHelp.js |  24 +-
 dev/View/User/AbstractSystemDropDown.js |   1 +
 dev/View/User/MailBox/MessageList.js    |   8 +
 dev/View/User/MailBox/MessageView.js    |  15 +-
 npm-shrinkwrap.json                     | 531 ++++++++++--------------
 package.json                            |   3 +-
 15 files changed, 342 insertions(+), 398 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 404fd4755..129d335af 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -35,7 +35,7 @@ module.exports = {
 
 		"comma-dangle": [2, "never"],		// disallow or enforce trailing commas
 		"no-cond-assign": [2, "always"],	// disallow assignment in conditional expressions
-		"no-console": 1,					// disallow use of console (off by default in the node environment)
+		"no-console": 2,					// disallow use of console (off by default in the node environment)
 		"no-constant-condition": 2,			// disallow use of constant expressions in conditions
 		"no-control-regex": 2,				// disallow control characters in regular expressions
 		"no-debugger": 2,					// disallow use of debugger
@@ -46,7 +46,7 @@ module.exports = {
 		"no-empty-character-class": 2,		// disallow the use of empty character classes in regular expressions
 		"no-ex-assign": 2,					// disallow assigning to the exception in a catch block
 		"no-extra-boolean-cast": 2,			// disallow double-negation boolean casts in a boolean context
-		"no-extra-parens": 0,				// disallow unnecessary parentheses (off by default)
+//		"no-extra-parens": 2,				// disallow unnecessary parentheses (off by default)
 		"no-extra-semi": 2,					// disallow unnecessary semicolons
 		"no-func-assign": 2,				// disallow overwriting functions written as function declarations
 		"no-inner-declarations": 2,			// disallow function or variable declarations in nested blocks
@@ -70,9 +70,9 @@ module.exports = {
 
 		"accessor-pairs": 2,				// enforce getter and setter pairs in objects
 		"block-scoped-var": 2,				// treat var statements as if they were block scoped (off by default). 0: deep destructuring is not compatible https://github.com/eslint/eslint/issues/1863
-//		"complexity": 0,					// specify the maximum cyclomatic complexity allowed in a program (off by default)
+//		"complexity": 2,					// specify the maximum cyclomatic complexity allowed in a program (off by default)
 		"consistent-return": 2,				// require return statements to either always or never specify values
-		"curly": 2,							// specify curly brace conventions for all control statements
+		"curly": 2,							// specify curly brace conventions for allphpuni	 control statements
 		"default-case": 2,					// require default case in switch statements (off by default)
 		"dot-location": [2, "property"],	// enforce consistent newlines before and after dots
 		"dot-notation": 2,					// encourages use of dot notation whenever possible
@@ -82,7 +82,6 @@ module.exports = {
 		"no-caller": 2,						// disallow use of arguments.caller or arguments.callee
 		"no-div-regex": 2,					// disallow division operators explicitly at beginning of regular expression (off by default)
 		"no-else-return": 2,				// disallow else after a return in an if (off by default)
-		"no-empty-label": 2,				// disallow use of labels for anything other then loops and switches
 		"no-eq-null": 2,					// disallow comparisons to null without a type-checking operator (off by default)
 		"no-eval": 2,						// disallow use of eval()
 		"no-extend-native": 2,				// disallow adding to native types
@@ -113,7 +112,7 @@ module.exports = {
 		"no-throw-literal": 2,				// restrict what can be thrown as an exception (off by default)
 		"no-unused-expressions": 2,			// disallow usage of expressions in statement position
 		"no-void": 2,						// disallow use of void operator (off by default)
-		"no-warning-comments": 1,			// disallow usage of configurable warning terms in comments": 2, // e.g. TODO or FIXME (off by default)
+		"no-warning-comments": 2,			// disallow usage of configurable warning terms in comments": 2, // e.g. TODO or FIXME (off by default)
 		"no-with": 2,						// disallow use of the with statement
 		"radix": 2,							// require use of the second argument for parseInt() (off by default)
 //		"vars-on-top": 2,					// requires to declare all vars on top of their containing scope (off by default)
@@ -135,20 +134,20 @@ module.exports = {
 
 		// stylistic issues
 
-		"array-bracket-spacing": 1,			// enforce consistent spacing inside array brackets
-		"block-spacing": [1, "never"],		// enforce consistent spacing inside single-line blocks
+		"array-bracket-spacing": 2,			// enforce consistent spacing inside array brackets
+		"block-spacing": [2, "never"],		// enforce consistent spacing inside single-line blocks
 
-//		"brace-style": [1, "1tbs"],			// enforce consistent brace style for blocks
+//		"brace-style": [2, "1tbs"],			// enforce consistent brace style for blocks
 
-//		"camelcase": 1,						// enforce camelcase naming convention
-		"comma-spacing": 1,					// enforce consistent spacing before and after commas
-		"comma-style": 1,					// enforce consistent comma style
-		"computed-property-spacing": 1,		// enforce consistent spacing inside computed property brackets
-		"consistent-this": [1, "self"],		// enforce consistent naming when capturing the current execution context
-		"eol-last": 1,						// enforce at least one newline at the end of files
-		"id-match": 1,						// require identifiers to match a specified regular expression
+//		"camelcase": 2,						// enforce camelcase naming convention
+		"comma-spacing": 2,					// enforce consistent spacing before and after commas
+		"comma-style": 2,					// enforce consistent comma style
+		"computed-property-spacing": 2,		// enforce consistent spacing inside computed property brackets
+		"consistent-this": [2, "self"],		// enforce consistent naming when capturing the current execution context
+		"eol-last": 2,						// enforce at least one newline at the end of files
+		"id-match": 2,						// require identifiers to match a specified regular expression
 
-		"indent": [1, "tab", {				// enforce consistent indentation
+		"indent": [2, "tab", {				// enforce consistent indentation
 			"SwitchCase": 1,
 			"VariableDeclarator": {
 				"var": 1,
@@ -157,48 +156,48 @@ module.exports = {
 			}
 		}],
 
-		"key-spacing": 1,					// enforce consistent spacing between keys and values in object literal properties
-		"linebreak-style": [1, "windows"],	// enforce consistent linebreak style
-		"lines-around-comment": 0,			// require empty lines around comments
-		"max-depth": 0,						// enforce a maximum depth that blocks can be nested
-		"max-len": [1, 200],				// enforce a maximum line length
-		"max-lines": 0,						// enforce a maximum file length
-		"max-nested-callbacks": [1, 5],		// enforce a maximum depth that callbacks can be nested
-		"max-params": 0,					// enforce a maximum number of parameters in function definitions
-		"max-statements": 0,				// enforce a maximum number of statements allowed in function blocks
-		"max-statements-per-line": 0,		// enforce a maximum number of statements allowed per line
-		"new-cap": 1,						// require constructor function names to begin with a capital letter
-		"new-parens": 1,					// require parentheses when invoking a constructor with no arguments
-		"newline-after-var": 0,				// require or disallow an empty line after var declarations
-		"newline-before-return": 0,			// require an empty line before return statements
-		"newline-per-chained-call": 0,		// require a newline after each call in a method chain
-		"no-array-constructor": 1,			// disallow Array constructors
-		"no-bitwise": 1,					// disallow bitwise operators
-		"no-continue": 1,					// disallow continue statements
-		"no-inline-comments": 0,			// disallow inline comments after code
-		"no-lonely-if": 0,					// disallow if statements as the only statement in else blocks
-		"no-mixed-operators": 0,			// disallow mixes of different operators
+		"key-spacing": 2,					// enforce consistent spacing between keys and values in object literal properties
+		"linebreak-style": [2, "windows"],	// enforce consistent linebreak style
+//		"lines-around-comment": 2,			// require empty lines around comments
+//		"max-depth": 2,						// enforce a maximum depth that blocks can be nested
+		"max-len": [2, 200],				// enforce a maximum line length
+//		"max-lines": 2,						// enforce a maximum file length
+		"max-nested-callbacks": [2, 5],		// enforce a maximum depth that callbacks can be nested
+//		"max-params": 2,					// enforce a maximum number of parameters in function definitions
+//		"max-statements": 2,				// enforce a maximum number of statements allowed in function blocks
+		"max-statements-per-line": 2,		// enforce a maximum number of statements allowed per line
+		"new-cap": 2,						// require constructor function names to begin with a capital letter
+		"new-parens": 2,					// require parentheses when invoking a constructor with no arguments
+//		"newline-after-var": 2,				// require or disallow an empty line after var declarations
+//		"newline-before-return": 2,			// require an empty line before return statements
+//		"newline-per-chained-call": 2,		// require a newline after each call in a method chain
+		"no-array-constructor": 2,			// disallow Array constructors
+		"no-bitwise": 2,					// disallow bitwise operators
+		"no-continue": 2,					// disallow continue statements
+//		"no-inline-comments": 2,			// disallow inline comments after code
+//		"no-lonely-if": 2,					// disallow if statements as the only statement in else blocks
+//		"no-mixed-operators": 2,			// disallow mixes of different operators
 		"no-mixed-spaces-and-tabs": 2,		// disallow mixed spaces and tabs for indentation
 		"no-multiple-empty-lines": 2,		// disallow multiple empty lines
-		"no-negated-condition": 0,			// disallow negated conditions
-		"no-nested-ternary": 0,				// disallow nested ternary expressions
+//		"no-negated-condition": 2,			// disallow negated conditions
+//		"no-nested-ternary": 2,				// disallow nested ternary expressions
 		"no-new-object": 2,					// disallow Object constructors
-		"no-plusplus": [1, {				// disallow the unary operators ++ and --
+		"no-plusplus": [2, {				// disallow the unary operators ++ and --
 			"allowForLoopAfterthoughts": true
 		}],
-		"no-restricted-syntax": 1,				// disallow specified syntax
-		"no-spaced-func": 1,					// disallow spacing between function identifiers and their applications
+		"no-restricted-syntax": 2,				// disallow specified syntax
+		"no-spaced-func": 2,					// disallow spacing between function identifiers and their applications
 		"no-ternary": 0,						// disallow ternary operators
-		"no-trailing-spaces": 1,				// disallow trailing whitespace at the end of lines
-		"no-underscore-dangle": 0,				// disallow dangling underscores in identifiers
-		"no-unneeded-ternary": 1,				// disallow ternary operators when simpler alternatives exist
-		"no-whitespace-before-property": 0,		// disallow whitespace before properties
-		"object-curly-newline": 0,				// enforce consistent line breaks inside braces
-		"object-curly-spacing": [1, "never"],	// enforce consistent spacing inside braces
+		"no-trailing-spaces": 2,				// disallow trailing whitespace at the end of lines
+//		"no-underscore-dangle": 2,				// disallow dangling underscores in identifiers
+		"no-unneeded-ternary": 2,				// disallow ternary operators when simpler alternatives exist
+//		"no-whitespace-before-property": 2,		// disallow whitespace before properties
+//		"object-curly-newline": 2,				// enforce consistent line breaks inside braces
+		"object-curly-spacing": [2, "never"],	// enforce consistent spacing inside braces
 
-		"object-property-newline": [0, {		// enforce placing object properties on separate lines
-			"allowMultiplePropertiesPerLine": false
-		}],
+//		"object-property-newline": [2, {		// enforce placing object properties on separate lines
+//			"allowMultiplePropertiesPerLine": false
+//		}],
 
 //		"one-var": [2, {								// enforce variables to be declared either together or separately in functions
 //			"var": "always",
@@ -206,24 +205,24 @@ module.exports = {
 //			"const": "never"
 //		}],
 
-		"one-var-declaration-per-line": [0, "always"],	// require or disallow newlines around var declarations
-		"operator-assignment": 1,						// require or disallow assignment operator shorthand where possible
-		"operator-linebreak": [1, "after"],				// enforce consistent linebreak style for operators
-		"padded-blocks": [0, "never"],					// require or disallow padding within blocks
-		"quote-props": [0, "as-needed"],				// require quotes around object literal property names
+//		"one-var-declaration-per-line": [2, "always"],	// require or disallow newlines around var declarations
+		"operator-assignment": 2,						// require or disallow assignment operator shorthand where possible
+		"operator-linebreak": [2, "after"],				// enforce consistent linebreak style for operators
+//		"padded-blocks": [2, "never"],					// require or disallow padding within blocks
+//		"quote-props": [2, "as-needed"],				// require quotes around object literal property names
 		"quotes": [2, "single"],						// enforce the consistent use of either backticks, double, or single quotes
-		"require-jsdoc": 1,								// require JSDoc comments
-		"semi":	[1, "always"],							// require or disallow semicolons instead of ASI
-		"semi-spacing": 1,								// enforce consistent spacing before and after semicolons
-		"sort-vars": 0,									// require variables within the same declaration block to be sorted
-		"space-before-blocks": 1,						// enforce consistent spacing before blocks
-		"space-before-function-paren": [1, "never"],	// enforce consistent spacing before function definition opening parenthesis
-		"space-in-parens": 1,							// enforce consistent spacing inside parentheses
-		"space-infix-ops": 1,							// require spacing around operators
-		"space-unary-ops": 1,							// enforce consistent spacing before or after unary operators
-		"spaced-comment": 1,							// enforce consistent spacing after the // or /* in a comment
-//		"unicode-bom": [1, "never"],					// require or disallow the Unicode BOM
-		"wrap-regex": 1,								// require parenthesis around regex literals
+		"require-jsdoc": 2,								// require JSDoc comments
+		"semi":	[2, "always"],							// require or disallow semicolons instead of ASI
+		"semi-spacing": 2,								// enforce consistent spacing before and after semicolons
+//		"sort-vars": 2,									// require variables within the same declaration block to be sorted
+		"space-before-blocks": 2,						// enforce consistent spacing before blocks
+		"space-before-function-paren": [2, "never"],	// enforce consistent spacing before function definition opening parenthesis
+		"space-in-parens": 2,							// enforce consistent spacing inside parentheses
+		"space-infix-ops": 2,							// require spacing around operators
+		"space-unary-ops": 2,							// enforce consistent spacing before or after unary operators
+		"spaced-comment": 2,							// enforce consistent spacing after the // or /* in a comment
+//		"unicode-bom": [2, "never"],					// require or disallow the Unicode BOM
+		"wrap-regex": 2,								// require parenthesis around regex literals
 
 		// es6
 
diff --git a/dev/App/Abstract.jsx b/dev/App/Abstract.jsx
index a6468ab49..eceee4b8e 100644
--- a/dev/App/Abstract.jsx
+++ b/dev/App/Abstract.jsx
@@ -187,7 +187,9 @@ class AbstractApp extends AbstractBoot
 	}
 
 	redirectToAdminPanel() {
-		_.delay(() => window.location.href = Links.rootAdmin(), 100);
+		_.delay(() => {
+			window.location.href = Links.rootAdmin();
+		}, 100);
 	}
 
 	clearClientSideToken() {
diff --git a/dev/Common/HtmlEditor.jsx b/dev/Common/HtmlEditor.jsx
index c484cb705..26770d95c 100644
--- a/dev/Common/HtmlEditor.jsx
+++ b/dev/Common/HtmlEditor.jsx
@@ -270,6 +270,8 @@ class HtmlEditor
 						{
 							return false;
 						}
+
+						return true;
 					});
 
 					this.editor.on('blur', () => {
diff --git a/dev/Common/Selector.jsx b/dev/Common/Selector.jsx
index ff8ecf3fd..ab33151c8 100644
--- a/dev/Common/Selector.jsx
+++ b/dev/Common/Selector.jsx
@@ -403,6 +403,8 @@ class Selector
 						return false;
 					}
 				}
+
+				return true;
 			});
 		}
 	}
diff --git a/dev/External/ko.js b/dev/External/ko.js
index bced6657a..232b7d4c9 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -407,6 +407,7 @@ ko.bindingHandlers.onTab = {
 			{
 				return fValueAccessor().call(oViewModel, !!oEvent.shiftKey);
 			}
+			return true;
 		});
 
 		ko.utils.domNodeDisposal.addDisposeCallback(oElement, function() {
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index 764395ba3..d6fb799af 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -98,6 +98,8 @@ function SecurityAdminSettings()
 			'NewPassword': this.adminPasswordNew()
 		});
 
+		return true;
+
 	}, function() {
 		return '' !== Utils.trim(this.adminLogin()) && '' !== this.adminPassword();
 	});
diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js
index 4d795bbca..6058f4af3 100644
--- a/dev/Stores/User/Pgp.js
+++ b/dev/Stores/User/Pgp.js
@@ -85,7 +85,9 @@ PgpUserStore.prototype.findPrivateKeysByEncryptionKeyIds = function(aEncryptionK
 	{
 		aResult = _.uniq(_.compact(_.flatten(_.map(aRecipients, function(sEmail) {
 			var aKeys = sEmail ? self.findAllPrivateKeysByEmailNotNative(sEmail) : null;
-			return aKeys ? (bReturnWrapKeys ? aKeys : _.flatten(_.map(aKeys, function(oKey) {return oKey.getNativeKeys();}), true)) : [null];
+			return aKeys ? (bReturnWrapKeys ? aKeys : _.flatten(_.map(aKeys, function(oKey) {
+				return oKey.getNativeKeys();
+			}), true)) : [null];
 		}), true)), function(oKey) {return oKey.id;});
 	}
 
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index ccffefb9f..d44e615b2 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -493,6 +493,8 @@ function ComposePopupView()
 			);
 		}
 
+		return true;
+
 	}, this.canBeSentOrSaved);
 
 	this.skipCommand = Utils.createCommand(this, function() {
@@ -1410,6 +1412,8 @@ ComposePopupView.prototype.onBuild = function()
 			self.identitiesDropdownTrigger(true);
 			return false;
 		}
+
+		return true;
 	});
 
 	key('ctrl+`', Enums.KeyState.Compose, function() {
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index e3ae60f73..d68a95d98 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -293,6 +293,8 @@ function ContactsPopupView()
 			}, 200);
 		}
 
+		return true;
+
 	}, function() {
 		return 0 < this.contactsCheckedOrSelected().length;
 	});
diff --git a/dev/View/Popup/KeyboardShortcutsHelp.js b/dev/View/Popup/KeyboardShortcutsHelp.js
index 9fc75b17a..e78c79ba6 100644
--- a/dev/View/Popup/KeyboardShortcutsHelp.js
+++ b/dev/View/Popup/KeyboardShortcutsHelp.js
@@ -26,31 +26,35 @@ _.extend(KeyboardShortcutsHelpPopupView.prototype, AbstractView.prototype);
 
 KeyboardShortcutsHelpPopupView.prototype.onBuild = function(oDom)
 {
-	key('tab, shift+tab, left, right', Enums.KeyState.PopupKeyboardShortcutsHelp, _.throttle(_.bind(function(event, handler) {
+	key('tab, shift+tab, left, right', Enums.KeyState.PopupKeyboardShortcutsHelp, _.throttle(function(event, handler) {
+
 		if (event && handler)
 		{
 			var
 				$tabs = oDom.find('.nav.nav-tabs > li'),
-				bNext = handler && ('tab' === handler.shortcut || 'right' === handler.shortcut),
-				iIndex = $tabs.index($tabs.filter('.active'));
+				isNext = handler && ('tab' === handler.shortcut || 'right' === handler.shortcut),
+				index = $tabs.index($tabs.filter('.active'));
 
-			if (!bNext && 0 < iIndex)
+			if (!isNext && 0 < index)
 			{
-				iIndex -= 1;
+				index -= 1;
 			}
-			else if (bNext && iIndex < $tabs.length - 1)
+			else if (isNext && index < $tabs.length - 1)
 			{
-				iIndex += 1;
+				index += 1;
 			}
 			else
 			{
-				iIndex = bNext ? 0 : $tabs.length - 1;
+				index = isNext ? 0 : $tabs.length - 1;
 			}
 
-			$tabs.eq(iIndex).find('a[data-toggle="tab"]').tab('show');
+			$tabs.eq(index).find('a[data-toggle="tab"]').tab('show');
 			return false;
 		}
-	}, this), 100));
+
+		return true;
+
+	}, 100));
 };
 
 module.exports = KeyboardShortcutsHelpPopupView;
diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js
index 9892d0d42..d6f3087a5 100644
--- a/dev/View/User/AbstractSystemDropDown.js
+++ b/dev/View/User/AbstractSystemDropDown.js
@@ -131,6 +131,7 @@ AbstractSystemDropDownUserView.prototype.onBuild = function()
 			require('Knoin/Knoin').showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
 			return false;
 		}
+		return true;
 	});
 };
 
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index f59f109b7..0a60d680c 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -430,6 +430,8 @@ MessageListMailBoxUserView.prototype.goToUpUpOrDownDown = function(bUp)
 		}
 
 	}, 350);
+
+	return true;
 };
 
 MessageListMailBoxUserView.prototype.useAutoSelect = function()
@@ -788,6 +790,8 @@ MessageListMailBoxUserView.prototype.initShortcuts = function()
 			Events.pub('mailbox.message-view.toggle-full-screen');
 			return false;
 		}
+
+		return true;
 	});
 
 	if (Settings.capa(Enums.Capa.MessageListActions))
@@ -816,6 +820,8 @@ MessageListMailBoxUserView.prototype.initShortcuts = function()
 
 				return false;
 			}
+
+			return true;
 		});
 	}
 
@@ -921,6 +927,8 @@ MessageListMailBoxUserView.prototype.initShortcuts = function()
 			self.cancelThreadUid();
 			return false;
 		}
+
+		return true;
 	});
 
 	// change focused state
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 7ff2b72f8..b91de145b 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -820,12 +820,13 @@ MessageViewMailBoxUserView.prototype.escShortcuts = function()
 
 		return false;
 	}
+
+	return true;
 };
 
 MessageViewMailBoxUserView.prototype.initShortcuts = function()
 {
-	var
-		self = this;
+	var self = this;
 
 	// exit fullscreen, back
 	key('esc, backspace', Enums.KeyState.MessageView, _.bind(this.escShortcuts, this));
@@ -843,6 +844,8 @@ MessageViewMailBoxUserView.prototype.initShortcuts = function()
 			self.replyCommand();
 			return false;
 		}
+
+		return true;
 	});
 
 	// replaAll
@@ -852,6 +855,8 @@ MessageViewMailBoxUserView.prototype.initShortcuts = function()
 			self.replyAllCommand();
 			return false;
 		}
+
+		return true;
 	});
 
 	// forward
@@ -861,6 +866,8 @@ MessageViewMailBoxUserView.prototype.initShortcuts = function()
 			self.forwardCommand();
 			return false;
 		}
+
+		return true;
 	});
 
 	// message information
@@ -879,6 +886,8 @@ MessageViewMailBoxUserView.prototype.initShortcuts = function()
 			MessageStore.message().body.find('.rlBlockquoteSwitcher').click();
 			return false;
 		}
+
+		return true;
 	});
 
 	key('ctrl+up, command+up, ctrl+left, command+left', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function() {
@@ -916,6 +925,8 @@ MessageViewMailBoxUserView.prototype.initShortcuts = function()
 
 			return false;
 		}
+
+		return true;
 	});
 
 	// change focused state
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 16c3548b2..fee0c0172 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -89,7 +89,7 @@
     },
     "array-uniq": {
       "version": "1.0.3",
-      "from": "array-uniq@>=1.0.1 <2.0.0",
+      "from": "array-uniq@>=1.0.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
     },
     "array-unique": {
@@ -123,9 +123,9 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
     },
     "async": {
-      "version": "1.5.2",
-      "from": "async@>=1.4.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+      "version": "0.9.2",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
     },
     "async-each": {
       "version": "1.0.0",
@@ -627,7 +627,14 @@
     "buffer": {
       "version": "4.7.0",
       "from": "buffer@>=4.3.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.7.0.tgz"
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.7.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        }
+      }
     },
     "buffer-crc32": {
       "version": "0.2.5",
@@ -647,19 +654,7 @@
     "bufferstreams": {
       "version": "1.0.1",
       "from": "bufferstreams@1.0.1",
-      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "from": "readable-stream@>=1.0.33 <2.0.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz"
     },
     "builtin-modules": {
       "version": "1.1.1",
@@ -810,7 +805,19 @@
     "concat-stream": {
       "version": "1.5.1",
       "from": "concat-stream@>=1.4.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz"
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
     },
     "concat-with-sourcemaps": {
       "version": "1.0.4",
@@ -971,6 +978,11 @@
           "version": "1.1.6",
           "from": "esutils@>=1.1.6 <2.0.0",
           "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
         }
       }
     },
@@ -987,19 +999,7 @@
     "duplexer2": {
       "version": "0.0.2",
       "from": "duplexer2@0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
     },
     "duplexify": {
       "version": "3.4.3",
@@ -1010,6 +1010,16 @@
           "version": "1.0.0",
           "from": "end-of-stream@1.0.0",
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
         }
       }
     },
@@ -1102,9 +1112,14 @@
     },
     "eslint": {
       "version": "2.13.1",
-      "from": "eslint@>=2.13.1 <3.0.0",
+      "from": "eslint@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.13.1.tgz",
       "dependencies": {
+        "glob": {
+          "version": "7.0.5",
+          "from": "glob@>=7.0.3 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
+        },
         "globals": {
           "version": "9.8.0",
           "from": "globals@>=9.2.0 <10.0.0",
@@ -1144,11 +1159,6 @@
       "from": "estraverse@>=4.2.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"
     },
-    "estraverse-fb": {
-      "version": "1.3.1",
-      "from": "estraverse-fb@>=1.3.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.1.tgz"
-    },
     "esutils": {
       "version": "2.0.2",
       "from": "esutils@>=2.0.2 <3.0.0",
@@ -1254,14 +1264,7 @@
     "findup-sync": {
       "version": "0.3.0",
       "from": "findup-sync@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "from": "glob@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"
     },
     "first-chunk-stream": {
       "version": "1.0.0",
@@ -1301,14 +1304,7 @@
     "form-data": {
       "version": "0.1.4",
       "from": "form-data@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "from": "async@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"
     },
     "from": {
       "version": "0.1.3",
@@ -1341,9 +1337,9 @@
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
     },
     "glob": {
-      "version": "7.0.5",
-      "from": "glob@>=7.0.3 <8.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
+      "version": "5.0.15",
+      "from": "glob@>=5.0.0 <5.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
     },
     "glob-base": {
       "version": "0.3.0",
@@ -1365,11 +1361,6 @@
           "from": "glob@>=4.3.1 <5.0.0",
           "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
         },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "minimatch": {
           "version": "2.0.10",
           "from": "minimatch@>=2.0.1 <3.0.0",
@@ -1405,7 +1396,14 @@
     "globby": {
       "version": "5.0.0",
       "from": "globby@>=5.0.0 <6.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.0.5",
+          "from": "glob@>=7.0.3 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
+        }
+      }
     },
     "globule": {
       "version": "0.1.0",
@@ -1479,6 +1477,11 @@
       "from": "gulp-clean-css@>=2.0.7 <3.0.0",
       "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-2.0.10.tgz",
       "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
         "readable-stream": {
           "version": "2.1.4",
           "from": "readable-stream@>=2.1.4 <3.0.0",
@@ -1535,11 +1538,6 @@
           "from": "has-ansi@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"
         },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "lodash._reinterpolate": {
           "version": "2.4.1",
           "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
@@ -1610,106 +1608,24 @@
       }
     },
     "gulp-eslint": {
-      "version": "1.1.1",
-      "from": "gulp-eslint@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-1.1.1.tgz",
+      "version": "2.0.0",
+      "from": "gulp-eslint@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-2.0.0.tgz",
       "dependencies": {
         "bufferstreams": {
           "version": "1.1.1",
           "from": "bufferstreams@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz"
         },
-        "cli-width": {
-          "version": "1.1.1",
-          "from": "cli-width@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"
-        },
-        "doctrine": {
-          "version": "0.7.2",
-          "from": "doctrine@>=0.7.1 <0.8.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
-          "dependencies": {
-            "esutils": {
-              "version": "1.1.6",
-              "from": "esutils@>=1.1.6 <2.0.0",
-              "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
-            }
-          }
-        },
-        "eslint": {
-          "version": "1.10.3",
-          "from": "eslint@>=1.4.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz"
-        },
-        "espree": {
-          "version": "2.2.5",
-          "from": "espree@>=2.2.4 <3.0.0",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz"
-        },
-        "fast-levenshtein": {
-          "version": "1.0.7",
-          "from": "fast-levenshtein@>=1.0.6 <1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"
-        },
-        "glob": {
-          "version": "5.0.15",
-          "from": "glob@>=5.0.14 <6.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-        },
-        "inquirer": {
-          "version": "0.11.4",
-          "from": "inquirer@>=0.11.0 <0.12.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"
-        },
         "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
         },
-        "js-yaml": {
-          "version": "3.4.5",
-          "from": "js-yaml@3.4.5",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.5.tgz"
-        },
-        "levn": {
-          "version": "0.2.5",
-          "from": "levn@>=0.2.5 <0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.3.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        },
-        "lodash._baseclone": {
-          "version": "3.3.0",
-          "from": "lodash._baseclone@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz"
-        },
-        "lodash.clonedeep": {
-          "version": "3.0.2",
-          "from": "lodash.clonedeep@>=3.0.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
-        },
-        "optionator": {
-          "version": "0.6.0",
-          "from": "optionator@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.6.0.tgz"
-        },
-        "shelljs": {
-          "version": "0.5.3",
-          "from": "shelljs@>=0.5.3 <0.6.0",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-        },
-        "user-home": {
-          "version": "2.0.0",
-          "from": "user-home@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
         }
       }
     },
@@ -1728,11 +1644,6 @@
           "from": "gulp-match@>=0.2.1 <0.3.0",
           "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-0.2.1.tgz"
         },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "merge-stream": {
           "version": "0.1.8",
           "from": "merge-stream@>=0.1.6 <0.2.0",
@@ -1770,11 +1681,6 @@
           "from": "convert-source-map@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.4.1.tgz"
         },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "readable-stream": {
           "version": "1.0.34",
           "from": "readable-stream@>=1.0.17 <1.1.0",
@@ -1849,11 +1755,6 @@
       "from": "gulp-notify@>=2.2.0 <2.3.0",
       "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-2.2.0.tgz",
       "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "readable-stream": {
           "version": "1.0.34",
           "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
@@ -1879,7 +1780,19 @@
     "gulp-replace": {
       "version": "0.5.4",
       "from": "gulp-replace@*",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz"
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        }
+      }
     },
     "gulp-rimraf": {
       "version": "0.2.0",
@@ -1891,11 +1804,6 @@
       "from": "gulp-stripbom@*",
       "resolved": "https://registry.npmjs.org/gulp-stripbom/-/gulp-stripbom-1.0.4.tgz",
       "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "readable-stream": {
           "version": "1.0.34",
           "from": "readable-stream@>=1.0.17 <1.1.0",
@@ -1948,11 +1856,6 @@
           "from": "has-ansi@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"
         },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "readable-stream": {
           "version": "1.0.34",
           "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
@@ -2002,18 +1905,6 @@
       "from": "gulplog@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"
     },
-    "handlebars": {
-      "version": "4.0.5",
-      "from": "handlebars@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz",
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "from": "source-map@>=0.4.4 <0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
-        }
-      }
-    },
     "has-ansi": {
       "version": "2.0.0",
       "from": "has-ansi@>=2.0.0 <3.0.0",
@@ -2257,9 +2148,9 @@
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
     },
     "isarray": {
-      "version": "1.0.0",
-      "from": "isarray@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+      "version": "0.0.1",
+      "from": "isarray@0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
     },
     "isexe": {
       "version": "1.1.2",
@@ -2269,7 +2160,14 @@
     "isobject": {
       "version": "2.1.0",
       "from": "isobject@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        }
+      }
     },
     "istextorbinary": {
       "version": "1.0.2",
@@ -2430,11 +2328,6 @@
       "from": "lodash._arrayeach@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"
     },
-    "lodash._arraymap": {
-      "version": "3.0.0",
-      "from": "lodash._arraymap@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz"
-    },
     "lodash._baseassign": {
       "version": "3.2.0",
       "from": "lodash._baseassign@>=3.0.0 <4.0.0",
@@ -2450,26 +2343,11 @@
       "from": "lodash._basecopy@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
     },
-    "lodash._basedifference": {
-      "version": "3.0.3",
-      "from": "lodash._basedifference@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz"
-    },
-    "lodash._baseflatten": {
-      "version": "3.1.4",
-      "from": "lodash._baseflatten@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz"
-    },
     "lodash._basefor": {
       "version": "3.0.3",
       "from": "lodash._basefor@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz"
     },
-    "lodash._baseindexof": {
-      "version": "3.1.0",
-      "from": "lodash._baseindexof@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"
-    },
     "lodash._basetostring": {
       "version": "3.0.1",
       "from": "lodash._basetostring@>=3.0.0 <4.0.0",
@@ -2485,21 +2363,11 @@
       "from": "lodash._bindcallback@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
     },
-    "lodash._cacheindexof": {
-      "version": "3.0.2",
-      "from": "lodash._cacheindexof@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz"
-    },
     "lodash._createassigner": {
       "version": "3.1.1",
       "from": "lodash._createassigner@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"
     },
-    "lodash._createcache": {
-      "version": "3.1.2",
-      "from": "lodash._createcache@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz"
-    },
     "lodash._escapehtmlchar": {
       "version": "2.4.1",
       "from": "lodash._escapehtmlchar@>=2.4.1 <2.5.0",
@@ -2535,16 +2403,6 @@
       "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
       "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
     },
-    "lodash._pickbyarray": {
-      "version": "3.0.2",
-      "from": "lodash._pickbyarray@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz"
-    },
-    "lodash._pickbycallback": {
-      "version": "3.0.0",
-      "from": "lodash._pickbycallback@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz"
-    },
     "lodash._reescape": {
       "version": "3.0.0",
       "from": "lodash._reescape@>=3.0.0 <4.0.0",
@@ -2624,36 +2482,11 @@
       "from": "lodash.isobject@>=2.4.1 <2.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
     },
-    "lodash.isplainobject": {
-      "version": "3.2.0",
-      "from": "lodash.isplainobject@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz"
-    },
-    "lodash.istypedarray": {
-      "version": "3.0.6",
-      "from": "lodash.istypedarray@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"
-    },
     "lodash.keys": {
       "version": "3.1.2",
       "from": "lodash.keys@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
     },
-    "lodash.keysin": {
-      "version": "3.0.8",
-      "from": "lodash.keysin@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz"
-    },
-    "lodash.merge": {
-      "version": "3.3.2",
-      "from": "lodash.merge@>=3.3.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz"
-    },
-    "lodash.omit": {
-      "version": "3.1.0",
-      "from": "lodash.omit@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz"
-    },
     "lodash.rest": {
       "version": "4.0.3",
       "from": "lodash.rest@>=4.0.0 <5.0.0",
@@ -2674,11 +2507,6 @@
       "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"
     },
-    "lodash.toplainobject": {
-      "version": "3.0.0",
-      "from": "lodash.toplainobject@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz"
-    },
     "lodash.values": {
       "version": "2.4.1",
       "from": "lodash.values@>=2.4.1 <2.5.0",
@@ -2751,7 +2579,19 @@
     "memory-fs": {
       "version": "0.3.0",
       "from": "memory-fs@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        }
+      }
     },
     "meow": {
       "version": "3.7.0",
@@ -2761,7 +2601,19 @@
     "merge-stream": {
       "version": "1.0.0",
       "from": "merge-stream@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        }
+      }
     },
     "micromatch": {
       "version": "2.3.10",
@@ -2865,7 +2717,19 @@
     "node-libs-browser": {
       "version": "1.0.0",
       "from": "node-libs-browser@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-1.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-1.0.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.5 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        }
+      }
     },
     "node-notifier": {
       "version": "4.2.3",
@@ -2959,23 +2823,6 @@
       "from": "onetime@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
     },
-    "optimist": {
-      "version": "0.6.1",
-      "from": "optimist@>=0.6.1 <0.7.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-        }
-      }
-    },
     "optionator": {
       "version": "0.8.1",
       "from": "optionator@>=0.8.1 <0.9.0",
@@ -3248,14 +3095,26 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
     },
     "readable-stream": {
-      "version": "2.0.6",
-      "from": "readable-stream@>=2.0.0 <2.1.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+      "version": "1.1.14",
+      "from": "readable-stream@>=1.1.9 <1.2.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
     },
     "readdirp": {
       "version": "2.1.0",
       "from": "readdirp@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        }
+      }
     },
     "readline2": {
       "version": "1.0.1",
@@ -3339,10 +3198,20 @@
       "from": "replacestream@>=4.0.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.0.tgz",
       "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
         "object-assign": {
           "version": "3.0.0",
           "from": "object-assign@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
         }
       }
     },
@@ -3389,7 +3258,14 @@
     "rimraf": {
       "version": "2.5.2",
       "from": "rimraf@*",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.0.5",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
+        }
+      }
     },
     "ripemd160": {
       "version": "1.0.1",
@@ -3536,7 +3412,19 @@
     "stream-browserify": {
       "version": "2.0.1",
       "from": "stream-browserify@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        }
+      }
     },
     "stream-combiner": {
       "version": "0.0.4",
@@ -3552,6 +3440,16 @@
           "version": "0.1.4",
           "from": "duplexer2@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
         }
       }
     },
@@ -3638,7 +3536,19 @@
     "through2": {
       "version": "2.0.1",
       "from": "through2@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
     },
     "tildify": {
       "version": "1.2.0",
@@ -3714,7 +3624,7 @@
     },
     "uglify-js": {
       "version": "2.6.4",
-      "from": "uglify-js@>=2.6.0 <3.0.0",
+      "from": "uglify-js@2.6.4",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.4.tgz",
       "dependencies": {
         "async": {
@@ -3806,11 +3716,6 @@
           "from": "graceful-fs@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
         },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
         "readable-stream": {
           "version": "1.0.34",
           "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
@@ -3860,6 +3765,11 @@
       "from": "webpack@2.1.0-beta.13",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.1.0-beta.13.tgz",
       "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "from": "async@>=1.3.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+        },
         "camelcase": {
           "version": "3.0.0",
           "from": "camelcase@>=3.0.0 <4.0.0",
@@ -3942,11 +3852,6 @@
       "from": "write@>=0.2.1 <0.3.0",
       "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz"
     },
-    "xml-escape": {
-      "version": "1.0.0",
-      "from": "xml-escape@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz"
-    },
     "xregexp": {
       "version": "3.1.1",
       "from": "xregexp@>=3.0.0 <4.0.0",
@@ -3954,7 +3859,7 @@
     },
     "xtend": {
       "version": "4.0.1",
-      "from": "xtend@>=4.0.0 <5.0.0",
+      "from": "xtend@>=4.0.0 <4.1.0",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
     },
     "y18n": {
@@ -3992,9 +3897,9 @@
       }
     },
     "yazl": {
-      "version": "2.4.0",
+      "version": "2.4.1",
       "from": "yazl@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.0.tgz"
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.1.tgz"
     }
   }
 }
diff --git a/package.json b/package.json
index 98e8886fd..bec6cd7d1 100644
--- a/package.json
+++ b/package.json
@@ -56,14 +56,13 @@
     "babel-preset-stage-0": "^6.5.0",
     "babel-runtime": "^6.1.18",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^2.13.1",
     "gulp": "~3.9.0",
     "gulp-autoprefixer": "*",
     "gulp-beautify": "*",
     "gulp-clean-css": "^2.0.7",
     "gulp-concat-util": "*",
     "gulp-eol": "*",
-    "gulp-eslint": "^1.1.0",
+    "gulp-eslint": "^2.0.0",
     "gulp-header": "*",
     "gulp-if": "~1.2.5",
     "gulp-less": "1.3.6",