Merge branch 'core-integration' of https://github.com/thehyve/transmartApp into core-integration

Conflicts:
	grails-app/views/datasetExplorer/datasetExplorer.gsp