diff --git a/.project b/.project
index 300839c27f8..0d5f91caeb6 100644
--- a/.project
+++ b/.project
@@ -31,7 +31,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1400616658988</id>
+			<id>1489524263185</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -40,7 +40,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1400616658995</id>
+			<id>1489524263192</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -49,7 +49,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1400616658999</id>
+			<id>1489524263200</id>
 			<name></name>
 			<type>6</type>
 			<matcher>
@@ -58,7 +58,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1400616659006</id>
+			<id>1489524263206</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -67,7 +67,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1400616659012</id>
+			<id>1489524263212</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -76,6 +76,24 @@
 			</matcher>
 		</filter>
 		<filter>
+			<id>1489524263219</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.vscode</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1489524263240</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.idea</arguments>
+			</matcher>
+		</filter>
+		<filter>
 			<id>1336749023862</id>
 			<name>Source</name>
 			<type>6</type>
@@ -94,16 +112,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1400616508068</id>
-			<name>Tools</name>
-			<type>9</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-buildTasks</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1400616508072</id>
+			<id>1489523906243</id>
 			<name>Tools</name>
 			<type>9</type>
 			<matcher>
diff --git a/.settings/org.eclipse.wst.jsdt.core.prefs b/.settings/org.eclipse.wst.jsdt.core.prefs
index bcf46b9a765..334240db4f6 100644
--- a/.settings/org.eclipse.wst.jsdt.core.prefs
+++ b/.settings/org.eclipse.wst.jsdt.core.prefs
@@ -162,6 +162,7 @@ org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_superinterfaces=
 org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.wst.jsdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.wst.jsdt.core.formatter.insert_space_after_function_keyword=do not insert
 org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
diff --git a/.settings/org.eclipse.wst.json.core.prefs b/.settings/org.eclipse.wst.json.core.prefs
new file mode 100644
index 00000000000..745d897b00a
--- /dev/null
+++ b/.settings/org.eclipse.wst.json.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+missingEndObject=2
+missingStartObject=2
+syntaxValidation=true
+use-project-settings=true
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 00000000000..b054d0a2e7f
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,14 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201508251749
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=TF01
+vals/org.eclipse.wst.html.core.HTMLValidator/global=TF01
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file110ThirdPartyF02
+vals/org.eclipse.wst.json.core.json/groups=0107include02111contentType136org.eclipse.wst.json.core.jsonsourceT07fileext04jsonF0107exclude0104file116EOP-Invalid.jsonF01
+vals/org.eclipse.wst.xml.core.xml/global=TF03
+vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
+vf.version=3
diff --git a/Documentation/Contributors/EclipseGuide/README.md b/Documentation/Contributors/EclipseGuide/README.md
index 3126f207569..e6a7dcb1439 100644
--- a/Documentation/Contributors/EclipseGuide/README.md
+++ b/Documentation/Contributors/EclipseGuide/README.md
@@ -1,19 +1,19 @@
 # Eclipse Guide
 
-While primarily known as a Java IDE, Eclipse can be configured to work well for web development too.
+While primarily known as a Java IDE, Eclipse can be configured to work well for web development too.  These instructions are written for Eclipse Neon but the process is the same for any recent version.
 
 * Install [Java](http://www.java.com/en/download/manual.jsp) if it isn't already.
-* Download the [Eclipse IDE](http://www.eclipse.org/downloads/) for Java Developers.  Extract to a directory of your choice.  Run it.
+* Download the [Eclipse IDE for Java Developers](http://www.eclipse.org/downloads/eclipse-packages/).  Extract to a directory of your choice and run.  Create a workspace anywhere you like.
 
 * Install additional Eclipse components: JavaScript Development Tools and Eclipse Web Developer Tools.
-   * Help - Install New Software.  Work with: select *Mars* from the list.
+   * Help - Install New Software.  Work with: select *Neon* from the list.
    * Expand *Programming Languages*, check *JavaScript Development Tools*.
    * Expand *Web, XML, Java EE and OSGi Enterprise Development*, check *Eclipse Web Developer Tools*.
    * Next, Next, Accept, Finish, _wait_, No (we have more to install).
 
 ![The Java Development Tools installation dialog](indigo.jpg)
 
-* Install the [JSHint](http://www.jshint.com/) plugin: 
+* Install the [JSHint](http://www.jshint.com/) plugin:
    * Help - Install New Software.  Work with: `http://github.eclipsesource.com/jshint-eclipse/updates/`.
    * Check *JSHint*.  Next, Next, Accept, Finish, _wait_, OK, _wait_, Restart.