Merge remote-tracking branch 'upstream/develop' into ept-merge

.gitignore

@@ -15,7 +15,8 @@ libs/CesiumUnminified
 /pointclouds/D
 /pointclouds/wrneustadt
 /pointclouds/alszeile
+/pointclouds/heidentor
 /examples/page.html
 /resources/icons/index.html
 /examples/page.html
-/pointclouds/ept
+pointclouds/C

.vscode/settings.json

@@ -5,7 +5,7 @@
 		"*.fs": "cpp"
 	},
 	"files.trimTrailingWhitespace": false,
-	"editor.fontSize": 18,
+	"editor.fontSize": 20,
 	"editor.autoIndent": false,
 	"editor.detectIndentation": false,
 	"editor.renderWhitespace": "all",

README.md

@@ -26,8 +26,9 @@ Install all dependencies, as specified in package.json,
 then, install the gulp build tool:
 
     cd <potree_directory>
-    npm install 
+    npm install --save
     npm install -g gulp
+    npm install -g rollup
 
 Use the ```gulp watch``` command to