Merge branch 'develop' of https://github.com/NASAWorldWind/WorldWindJava into develop