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

# Conflicts:
#	.gitignore
#	.idea/inspectionProfiles/profiles_settings.xml
#	.idea/modules.xml
#	.idea/runConfigurations/ApplicationTemplate.xml
#	.idea/runConfigurations/KMLViewer.xml
#	.idea/runConfigurations/WMSLayerManager.xml
#	.travis.yml
#	GDAL_README.txt
#	ISSUE_TEMPLATE.md
#	LICENSE.gdal.TXT
#	LICENSE.jackson.TXT
#	README.md
#	WebView32.dll
#	WebView64.dll
#	build.properties
#	build.xml
#	gluegen-rt-natives-linux-amd64.jar
#	gluegen-rt-natives-linux-i586.jar
#	gluegen-rt-natives-macosx-universal.jar
#	gluegen-rt-natives-windows-amd64.jar
#	gluegen-rt-natives-windows-i586.jar
#	gluegen-rt.jar
#	jogl-all-natives-linux-amd64.jar
#	jogl-all-natives-linux-i586.jar
#	jogl-all-natives-macosx-universal.jar
#	jogl-all-natives-windows-amd64.jar
#	jogl-all-natives-windows-i586.jar
#	jogl-all.jar
#	libwebview.jnilib
#	src/gov/nasa/worldwind/Configuration.java
#	src/gov/nasa/worldwind/Exportable.java
#	src/gov/nasa/worldwind/View.java
#	src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java
#	src/gov/nasa/worldwind/animation/AnimationSupport.java
#	src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java
#	src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
#	src/gov/nasa/worldwind/cache/BasicDataFileStore.java
#	src/gov/nasa/worldwind/cache/MemoryCache.java
#	src/gov/nasa/worldwind/data/BasicRasterServer.java
#	src/gov/nasa/worldwind/data/DataRasterReader.java
#	src/gov/nasa/worldwind/data/GDALDataRaster.java
#	src/gov/nasa/worldwind/data/TiledRasterProducer.java
#	src/gov/nasa/worldwind/formats/shapefile/Shapefile.java
#	src/gov/nasa/worldwind/formats/shapefile/ShapefileLayerFactory.java
#	src/gov/nasa/worldwind/formats/shapefile/ShapefileRecord.java
#	src/gov/nasa/worldwind/geom/Angle.java
#	src/gov/nasa/worldwind/geom/Box.java
#	src/gov/nasa/worldwind/geom/Matrix.java
#	src/gov/nasa/worldwind/geom/Sector.java
#	src/gov/nasa/worldwind/geom/Vec4.java
#	src/gov/nasa/worldwind/geom/coords/MGRSCoordConverter.java
#	src/gov/nasa/worldwind/globes/Globe.java
#	src/gov/nasa/worldwind/layers/AbstractGraticuleLayer.java
#	src/gov/nasa/worldwind/layers/AbstractLayer.java
#	src/gov/nasa/worldwind/layers/SkyGradientLayer.java
#	src/gov/nasa/worldwind/layers/TerrainProfileLayer.java
#	src/gov/nasa/worldwind/layers/TiledImageLayer.java
#	src/gov/nasa/worldwind/layers/ViewControlsSelectListener.java
#	src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java
#	src/gov/nasa/worldwind/ogc/collada/ColladaRoot.java
#	src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java
#	src/gov/nasa/worldwind/ogc/kml/KMLAbstractFeature.java
#	src/gov/nasa/worldwind/ogc/kml/KMLLink.java
#	src/gov/nasa/worldwind/ogc/kml/KMLNetworkLink.java
#	src/gov/nasa/worldwind/ogc/kml/KMLRegion.java
#	src/gov/nasa/worldwind/ogc/kml/impl/KMLAbstractBalloon.java
#	src/gov/nasa/worldwind/ogc/kml/impl/KMLExportUtil.java
#	src/gov/nasa/worldwind/ogc/kml/impl/KMLModelPlacemarkImpl.java
#	src/gov/nasa/worldwind/ogc/kml/impl/KMLScreenImageImpl.java
#	src/gov/nasa/worldwind/ogc/wcs/wcs100/WCS100Capabilities.java
#	src/gov/nasa/worldwind/ogc/wms/WMSCapabilities.java
#	src/gov/nasa/worldwind/render/AbstractAnnotation.java
#	src/gov/nasa/worldwind/render/AbstractBrowserBalloon.java
#	src/gov/nasa/worldwind/render/AbstractSurfaceObject.java
#	src/gov/nasa/worldwind/render/BasicBalloonAttributes.java
#	src/gov/nasa/worldwind/render/BasicShapeAttributes.java
#	src/gov/nasa/worldwind/render/DrawContext.java
#	src/gov/nasa/worldwind/render/Ellipsoid.java
#	src/gov/nasa/worldwind/render/GlobeAnnotation.java
#	src/gov/nasa/worldwind/render/GlobeBrowserBalloon.java
#	src/gov/nasa/worldwind/render/IconRenderer.java
#	src/gov/nasa/worldwind/render/MultiLineTextRenderer.java
#	src/gov/nasa/worldwind/render/Path.java
#	src/gov/nasa/worldwind/render/PointPlacemark.java
#	src/gov/nasa/worldwind/render/PointPlacemarkAttributes.java
#	src/gov/nasa/worldwind/render/RigidShape.java
#	src/gov/nasa/worldwind/render/ScreenBrowserBalloon.java
#	src/gov/nasa/worldwind/render/Size.java
#	src/gov/nasa/worldwind/render/SurfaceObjectTileBuilder.java
#	src/gov/nasa/worldwind/render/TextRenderer.java
#	src/gov/nasa/worldwind/render/airspaces/BasicAirspaceAttributes.java
#	src/gov/nasa/worldwind/render/airspaces/Box.java
#	src/gov/nasa/worldwind/retrieve/JarRetriever.java
#	src/gov/nasa/worldwind/symbology/AbstractTacticalGraphic.java
#	src/gov/nasa/worldwind/symbology/AbstractTacticalSymbol.java
#	src/gov/nasa/worldwind/symbology/SymbologyConstants.java
#	src/gov/nasa/worldwind/symbology/TacticalGraphic.java
#	src/gov/nasa/worldwind/symbology/TacticalGraphicUtil.java
#	src/gov/nasa/worldwind/symbology/TacticalSymbol.java
#	src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525IconRetriever.java
#	src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525TacticalGraphic.java
#	src/gov/nasa/worldwind/symbology/milstd2525/MilStd2525TacticalSymbol.java
#	src/gov/nasa/worldwind/symbology/milstd2525/SymbolCode.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/MetocSidc.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/TriangleWavePositionIterator.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/areas/BasicArea.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/lines/DirectionOfAttack.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/lines/FireSupportLine.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/lines/HoldingLine.java
#	src/gov/nasa/worldwind/symbology/milstd2525/graphics/lines/LinearTarget.java
#	src/gov/nasa/worldwind/terrain/AbstractElevationModel.java
#	src/gov/nasa/worldwind/terrain/BasicElevationModel.java
#	src/gov/nasa/worldwind/terrain/HighResolutionTerrain.java
#	src/gov/nasa/worldwind/terrain/SectorGeometry.java
#	src/gov/nasa/worldwind/terrain/SectorGeometryList.java
#	src/gov/nasa/worldwind/terrain/WMSBasicElevationModel.java
#	src/gov/nasa/worldwind/util/BasicDragger.java
#	src/gov/nasa/worldwind/util/BasicNamespaceContext.java
#	src/gov/nasa/worldwind/util/ClippingTessellator.java
#	src/gov/nasa/worldwind/util/CompoundVecBuffer.java
#	src/gov/nasa/worldwind/util/DataConfigurationUtils.java
#	src/gov/nasa/worldwind/util/EGM96.java
#	src/gov/nasa/worldwind/util/GLUTessellatorSupport.java
#	src/gov/nasa/worldwind/util/MessageStrings.properties
#	src/gov/nasa/worldwind/util/OGLRenderToTextureSupport.java
#	src/gov/nasa/worldwind/util/OGLUtil.java
#	src/gov/nasa/worldwind/util/PolygonTessellator2.java
#	src/gov/nasa/worldwind/util/RestorableSupport.java
#	src/gov/nasa/worldwind/util/SectorVisibilityTree.java
#	src/gov/nasa/worldwind/util/TextureAtlas.java
#	src/gov/nasa/worldwind/util/TileKey.java
#	src/gov/nasa/worldwind/util/WWIO.java
#	src/gov/nasa/worldwind/util/WWMath.java
#	src/gov/nasa/worldwind/util/WWUtil.java
#	src/gov/nasa/worldwind/util/WWXML.java
#	src/gov/nasa/worldwind/util/gdal/GDALUtils.java
#	src/gov/nasa/worldwind/util/layertree/LayerTreeModel.java
#	src/gov/nasa/worldwind/util/measure/LengthMeasurer.java
#	src/gov/nasa/worldwind/util/measure/MeasureTool.java
#	src/gov/nasa/worldwind/util/tree/BasicTreeLayout.java
#	src/gov/nasa/worldwind/util/tree/ScrollFrame.java
#	src/gov/nasa/worldwind/util/webview/WebView.java
#	src/gov/nasa/worldwind/util/webview/WindowsWebView.java
#	src/gov/nasa/worldwind/util/webview/WindowsWebViewJNI.java
#	src/gov/nasa/worldwind/view/BasicViewPropertyLimits.java
#	src/gov/nasa/worldwind/view/orbit/BasicOrbitViewLimits.java
#	src/gov/nasa/worldwind/view/orbit/OrbitView.java
#	src/gov/nasa/worldwind/wms/WMSNamespaceContext.java
#	src/gov/nasa/worldwindx/applications/sar/ElementParser.java
#	src/gov/nasa/worldwindx/examples/AirspaceBuilder.java
#	src/gov/nasa/worldwindx/examples/Balloons.java
#	src/gov/nasa/worldwindx/examples/ConfiguringGLRuntimeCapabilities.java
#	src/gov/nasa/worldwindx/examples/DebuggingGLErrors.java
#	src/gov/nasa/worldwindx/examples/GoToCoordinatePanel.java
#	src/gov/nasa/worldwindx/examples/LineBuilder.java
#	src/gov/nasa/worldwindx/examples/MultiResPath.java
#	src/gov/nasa/worldwindx/examples/ScankortDenmark.java
#	src/gov/nasa/worldwindx/examples/WebBrowserBalloons.java
#	src/gov/nasa/worldwindx/examples/WorldWindDiagnostics.java
#	src/gov/nasa/worldwindx/examples/analytics/AnalyticSurface.java
#	src/gov/nasa/worldwindx/examples/lineofsight/LinesOfSight.java
#	src/gov/nasa/worldwindx/examples/symbology/Symbology.java
#	src/gov/nasa/worldwindx/examples/symbology/TacticalGraphics.java
#	src/gov/nasa/worldwindx/examples/symbology/TacticalSymbols.java
#	src/gov/nasa/worldwindx/examples/tutorial/Cube.java
#	src/gov/nasa/worldwindx/examples/util/BalloonController.java
#	src/gov/nasa/worldwindx/examples/util/DirectedPath.java
#	src/gov/nasa/worldwindx/examples/util/HotSpotController.java
#	src/gov/nasa/worldwindx/examples/util/LayerManagerLayer.java
#	src/gov/nasa/worldwindx/examples/util/OpenStreetMapShapefileLoader.java
#	src/gov/nasa/worldwindx/examples/util/ShapefileLoader.java
#	src/org/codehaus/jackson/Base64Variant.java
#	src/org/codehaus/jackson/Base64Variants.java
#	src/org/codehaus/jackson/JsonFactory.java
#	src/org/codehaus/jackson/JsonGenerator.java
#	src/org/codehaus/jackson/JsonLocation.java
#	src/org/codehaus/jackson/JsonNode.java
#	src/org/codehaus/jackson/JsonParser.java
#	src/org/codehaus/jackson/JsonStreamContext.java
#	src/org/codehaus/jackson/JsonToken.java
#	src/org/codehaus/jackson/ObjectCodec.java
#	src/org/codehaus/jackson/PrettyPrinter.java
#	src/org/codehaus/jackson/annotate/JsonAnySetter.java
#	src/org/codehaus/jackson/annotate/JsonAutoDetect.java
#	src/org/codehaus/jackson/annotate/JsonClass.java
#	src/org/codehaus/jackson/annotate/JsonContentClass.java
#	src/org/codehaus/jackson/annotate/JsonGetter.java
#	src/org/codehaus/jackson/annotate/JsonIgnore.java
#	src/org/codehaus/jackson/annotate/JsonIgnoreProperties.java
#	src/org/codehaus/jackson/annotate/JsonKeyClass.java
#	src/org/codehaus/jackson/annotate/JsonProperty.java
#	src/org/codehaus/jackson/annotate/JsonPropertyOrder.java
#	src/org/codehaus/jackson/annotate/JsonSetter.java
#	src/org/codehaus/jackson/annotate/JsonSubTypes.java
#	src/org/codehaus/jackson/annotate/JsonTypeInfo.java
#	src/org/codehaus/jackson/annotate/JsonTypeName.java
#	src/org/codehaus/jackson/annotate/JsonValue.java
#	src/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
#	src/org/codehaus/jackson/impl/ByteSourceBootstrapper.java
#	src/org/codehaus/jackson/impl/JsonGeneratorBase.java
#	src/org/codehaus/jackson/impl/JsonNumericParserBase.java
#	src/org/codehaus/jackson/impl/JsonParserBase.java
#	src/org/codehaus/jackson/impl/JsonReadContext.java
#	src/org/codehaus/jackson/impl/JsonWriteContext.java
#	src/org/codehaus/jackson/impl/ReaderBasedParser.java
#	src/org/codehaus/jackson/impl/Utf8StreamParser.java
#	src/org/codehaus/jackson/impl/WriterBasedGenerator.java
#	src/org/codehaus/jackson/io/IOContext.java
#	src/org/codehaus/jackson/io/NumberInput.java
#	src/org/codehaus/jackson/io/NumberOutput.java
#	src/org/codehaus/jackson/io/SegmentedStringWriter.java
#	src/org/codehaus/jackson/sym/BytesToNameCanonicalizer.java
#	src/org/codehaus/jackson/sym/CharsToNameCanonicalizer.java
#	src/org/codehaus/jackson/type/JavaType.java
#	src/org/codehaus/jackson/type/TypeReference.java
#	src/org/codehaus/jackson/util/ByteArrayBuilder.java
#	src/org/codehaus/jackson/util/JsonParserSequence.java
#	src/org/codehaus/jackson/util/TextBuffer.java
#	src/org/codehaus/jackson/util/TokenBuffer.java
#	src/overview.html
#	test/gov/nasa/worldwind/util/OGLUtilTest.java

Author: EMaksymenko

.gitignore

@@ -1,15 +1,15 @@
 .DS_Store
 
-.idea/shelf
-.idea/tasks.xml
-.idea/workspace.xml
+.idea
 
 build
 classes
 testClasses
 
 worldwind.jar
 worldwindx.jar
+/dist/
+/nbproject/private/
 
 gradle
 gradlew