xc
Merge branch 'master' of https://github.com/baseio/dataglobe
UI Complete
Merge branch 'master' of https://github.com/baseio/dataglobe

Conflicts:
	.gitignore
	sources/gsi/index.json