Initial commit
Clean up files, fix flash messages.
Cleanup
Removed generated files
Exclude Eclipse files
Fixed modal bug (offsetting main page) and removed target files
Fixing modals, GUI tweaks
initial commit
d2rq and MiniDix services added to setting; table join conditions fixed
Merge remote-tracking branch 'origin/ontodics'

Conflicts:
	.gitignore
	src/main/java/authentication/FrameworkConfiguration.java
	src/main/resources/geoknow-initial-settings.ttl
	src/main/resources/geoknow-settings.ttl
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/css/app.css
	src/main/webapp/img/favicon.png
	src/main/webapp/index.html
	src/main/webapp/js/app.js
	src/main/webapp/js/config.js
	src/main/webapp/js/controllers.js
	src/main/webapp/js/directives.js
	src/main/webapp/js/services.js
	src/main/webapp/partials/account.html
	src/main/webapp/partials/admin/users.html
	src/main/webapp/partials/authoring/ontowiki.html
	src/main/webapp/partials/default.html
	src/main/webapp/partials/enriching-and-cleaning/geolift-result.html
	src/main/webapp/partials/enriching-and-cleaning/geolift.html
	src/main/webapp/partials/extraction-and-loading/import-rdf.html
	src/main/webapp/partials/extraction-and-loading/sparqlify.html
	src/main/webapp/partials/extraction-and-loading/triplegeo-result.html
	src/main/webapp/partials/extraction-and-loading/triplegeo.html
	src/main/webapp/partials/linking/limes-result.html
	src/main/webapp/partials/linking/limes.html
	src/main/webapp/partials/querying-and-exploration/facete.html
	src/main/webapp/partials/querying-and-exploration/mappify.html
	src/main/webapp/partials/querying-and-exploration/virtuoso.html
	src/main/webapp/partials/settings.html
	src/main/webapp/partials/settings/data-sources.html
	src/main/webapp/partials/settings/datasets.html
	src/main/webapp/partials/settings/namespaces.html
	src/main/webapp/partials/settings/preferences.html
	src/main/webapp/popup.html
Restore default settings.
Update settings files
request url fixed
Merge branch 'master' of dow.ontos.eu:ontos-lds
Fixed buttons & modals
Gui tweaks
Fixed conflict
Merge branch 'master' of git@dow.ontos.eu:ontos-lds.git
Fixing more modals
typo fixed