Merge branch 'develop' into testing

An annoying number of conflicts given that this should generally be a clean merge.

.editorconfig

@@ -0,0 +1,28 @@
+### http://EditorConfig.org
+
+root = true
+
+[**]
+charset = utf-8
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+### Don't force LF on Win platforms, change to native once available
+# end_of_line = lf
+insert_final_newline = true
+
+
+[Gruntfile.js]
+indent_size = 4
+
+[src/**]
+indent_size = 4
+
+[tests/lib/mockTouchEvents.js]
+indent_size = 4
+
+[tests/webdriver/index*.js]
+indent_size = 4
+
+[build/**.coffee]
+indent_size = 4

.gitattributes

@@ -0,0 +1,40 @@
+# Let git detect text files that are not listed below and let it normalize them
+# - convert line endings from LF to CRLF on checkout in Windows
+# - convert line endings from CRLF to LF on commit in Windows
+# - don't touch line endings in Linux / Mac
+
+* text=auto
+
+
+# Explicitly tell git which text files will be normalized
+
+# web languages
+*.js            text
+*.jsx           text
+*.json          text
+*.coffee        text
+*.html          text
+*.css           text
+
+# config files
+*.gitignore     text
+*.gitattributes text
+*.yml           text
+*.editorconfig  text
+*.npmignore     text
+*.jshintrc      text
+*.jshintignore  text
+
+# misc
+*.md            text
+*.sh            text
+*.frag          text
+*.vert          text
+
+
+# Explicitly tell git which binary files won't be normalized
+
+*.png   binary
+*.jpg   binary
+*.jpeg  binary
+*.wav   binary

.gitignore

@@ -4,6 +4,11 @@ build/api.json
 build/parseNodes.js
 build/parseSourceDocs.js
 build/api-gen.js
+build/webdriver/*
+!build/webdriver/README.md
+!build/webdriver/failed
+build/webdriver/failed/*
+!build/webdriver/failed/README.md
 .*.sw?
 .DS_store
 .project

.jshintignore

@@ -0,0 +1 @@
+tests/lib/**

.jshintrc

@@ -0,0 +1,16 @@
+{
+  "eqeqeq": true,
+  "esversion": 5,
+  "freeze": true,
+  "futurehostile": true,
+  "latedef": "nofunc",
+  "noarg": true,
+  "nonbsp": true,
+  "nonew": true,
+  "strict": "implied",
+  "undef": true,
+  "unused": "vars",
+  "validthis": true,
+  "browser": true,
+  "node": true
+}

.npmignore

@@ -0,0 +1,9 @@
+**
+!package.json
+!README.md
+!CHANGELOG.md
+!dist
+!dist/crafty.js
+!dist/crafty-min.js
+!src
+!src/**

.travis.yml

@@ -1,14 +1,24 @@
+sudo: false
+
 language: node_js
 node_js:
-  - '0.10'
-before_script:
-  - npm install -g grunt-cli
-
-after_success: ./travis-nightly.sh
-
+- '6'
 cache:
   directories:
-    - node_modules
+  - node_modules
+
+before_install: if [ "$TRAVIS_BRANCH" != "testing" ]; then unset SAUCE_USERNAME && unset SAUCE_ACCESS_KEY; fi
+before_script: npm install -g grunt-cli
+after_success: "./travis-nightly.sh"
+after_failure: if [ "$GH_TOKEN" ]; then grunt gh-pages:crafty-distro-regression-tests; fi
+
 env:
   global:
-    secure: p6SeAGd+Gohr6XeDkb5JPSQBu88UxAjljSMK0BNLJQgr8GkoA3mSJWy4uX0YjNq93VX4UMFxr0D4MlkcWZpX+cdN8K9PpxOgTq8Ml1Ljs355zbX9U/CdY99okiwzHktY4qKXBPsHLiEuCBeJ6pxs/v7m9z88mkjwDSunJG7F1oo=
+  # GitHub token
+  - secure: p6SeAGd+Gohr6XeDkb5JPSQBu88UxAjljSMK0BNLJQgr8GkoA3mSJWy4uX0YjNq93VX4UMFxr0D4MlkcWZpX+cdN8K9PpxOgTq8Ml1Ljs355zbX9U/CdY99okiwzHktY4qKXBPsHLiEuCBeJ6pxs/v7m9z88mkjwDSunJG7F1oo=
+  # OpenSauce credentials: for pre-relase testing
+  - secure: NO+7PK5P0XLGbnvdSDBlrlnzqM/hMTy3wxxAp8ZtzEuS2ZOXn8q0KjOO/cAs1NorG1SOl8+XfFZBTR5W504GrHYLP8fNkLJOAyKMfFeTojwQ+385ShVr/NejZFejsc+xJZymIeDsEzBZqosxPOi+8k7jljDK4mzLdKMpt8flWUw=
+  - secure: iGO+VCkCq/26Dqrc6+G1nX8Dk+tTqhcINuiIVhxGtMARcY+WIzcyEK/cfXRaLnvIzIxQ0xUoGGnM9xe4DQT8L+BGzo8AGnVbzxITzceWTlhsFepcbOTgqOg0ZGMxQVQ6VBh888Cdks8KsOgtTNhzd+oVgcStsyxZPCVD/7VgNTE=
+
+addons:
+  sauce_connect: true

.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "command": "grunt",
+    "isShellCommand": true,
+    "tasks": [
+        {
+            "taskName": "build:release",
+            "args": [],
+            "isBuildCommand": true,
+            "isWatching": false,
+            "problemMatcher": [
+                "$lessCompile",
+                "$tsc",
+                "$jshint"
+            ]
+        },
+        {
+            "taskName": "test",
+            "args": [],
+            "isTestCommand": true
+        }
+    ]
+}