Merge branch 'develop' of https://github.com/ModelCatalogue/modelcatalogue into develop

Conflicts:
	grails-app/conf/Config.groovy
Merge branch 'develop' of https://github.com/ModelCatalogue/modelcatalogue into develop

Conflicts:
	grails-app/conf/Config.groovy
Merge branch 'develop' of https://github.com/ModelCatalogue/modelcatalogue into develop
Merge branch 'develop' of https://github.com/ModelCatalogue/modelcatalogue into develop
no message
fixing export data type problem
latest changes for sprint
Fixed custom data element marshaller to bring into line with new extendible/published element. Added functionality to delete the search query when the context changes
changing build config to use latest snapshot of the plugin
latest changes using the new plugin
Merge pull request #8 from ModelCatalogue/feature/adam_latest

Feature/adam latest
Merge branch 'develop' into feature/SACTImporter

Conflicts:
	grails-app/conf/BuildConfig.groovy