Move marshallers from core-db to transmartApp

Conflicts:
	grails-app/conf/spring/resources.groovy
Move {Concepts,QueryTool}Controller from core-db
Merge branch 'master-cherry-picks' into rc2_dev