Merge branch 'develop' of github.com:HR-Data-Geyser/Data-Geyser into feature/globe-test

Merge branch 'develop' of github.com:HR-Data-Geyser/Data-Geyser into feature/globe-test

Conflicts:
	globe-test/globe.js
	globe-test/globetest.html
	globe-test/globetest.js