TripleGeo Integration
Merge branch 'master' of
https://github.com/GeoKnow/GeoKnowGeneratorUI.git

Conflicts:
	src/main/webapp/js/config.js