Merge remote-tracking branch 'origin/master' into vertexPositions

Conflicts:
	Source/DataSources/Entity.js
Fix minor typos

Find and replace in #1883 caused some bad pluralization.
cleanup tests
jazz up sandcastle examples
fix heights
Merge branch 'master' into polylineArc
Merge remote-tracking branch 'origin/master' into quadtreePrimitive

Conflicts:
	CHANGES.md
	Source/Scene/TileState.js
Fix QuadtreePrimitive example.
Start of states defaults
Merge pull request #1737 from AnalyticalGraphicsInc/quadtreePrimitive

Add QuadtreePrimitive
Merge remote-tracking branch 'origin/master' into gltf-8
Moved calculation of normal eye coordinates over to the vertex shader (in the case of pervertex lighting).
Changes after review.
Remove no longer necessary polyline that was part of the default polygon.
Merge pull request #1881 from AnalyticalGraphicsInc/vertexPositions

Refactor DynamicScene vertex positions
Merge branch 'master' into polylineArc
Remove old Jetty development server.

This has been replaced by server.js.
Merge pull request #1899 from AnalyticalGraphicsInc/removeOldProxy

Remove old Jetty development server.
Clean up cloc output.
Added unit tests for new builtin functions.
don't raise to surface for geometry updater