Merge branch 'master' into develop

diff --cc gulp/deploy.js
Simple merge

diff --cc package.json
index 12e6256349e2f2c4010176b206212d4d90790869,aa4af2aea5d7930886a7d8417a5394f65142aa2c..75d616eda7abb80935ba52eb81a582f3c98935b8
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -61,17 -53,12 +61,17 @@@
      "gulp-scss-lint": "^0.3.9",
      "gulp-sourcemaps": "^1.6.0",
      "gulp-uglify": "^1.1.0",
 -    "inquirer": "^0.11.2",
 +    "gulp-zip": "^3.2.0",
 +    "inquirer": "^0.11.4",
 +    "is-empty-object": "^1.1.1",
 +    "js-yaml": "^3.5.4",
      "mocha": "^2.3.3",
 +    "mocha-phantomjs": "^4.0.2",
      "motion-ui": "^1.1.0",
 -    "octophant": "^1.0.1",
 +    "multiline": "^1.0.2",
 +    "octophant": "^1.0.0",
      "opener": "^1.4.1",
-     "panini": "^1.1.1",
+     "panini": "^1.3.0",
      "parker": "0.0.9",
      "prettyjson": "^1.1.3",
      "require-dir": "^0.3.0",

diff --cc scss/settings/_settings.scss
Simple merge