Merge branch 'master' of github.com:JnJtranSMART/transmartApp_JNJ

Conflicts:
	application.properties
	grails-app/conf/BootStrap.groovy
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
	grails-app/controllers/ExperimentAnalysisController.groovy
	grails-app/controllers/GeneSignatureController.groovy
	grails-app/controllers/GexController.groovy
	grails-app/controllers/HelpController.groovy
	grails-app/controllers/LoginController.groovy
	grails-app/controllers/LogoutController.groovy
	grails-app/controllers/RWGController.groovy
	grails-app/controllers/SearchHelpController.groovy
	grails-app/controllers/TrialController.groovy
	grails-app/controllers/com/recomdata/transmart/data/export/ImperialHeatmapController.groovy
	grails-app/services/GeneSignatureService.groovy
	grails-app/services/com/recomdata/security/AuthUserDetailsService.groovy
	grails-app/services/com/recomdata/transmart/ExternaltoolService.groovy
	grails-app/services/com/recomdata/transmart/data/export/ClinicalDataService.groovy
	grails-app/services/com/recomdata/transmart/data/export/ExportService.groovy
	grails-app/views/RWG/index.gsp
	grails-app/views/datasetExplorer/datasetExplorer.gsp
	grails-app/views/help/guide.gsp
	grails-app/views/layouts/admin.gsp
	grails-app/views/layouts/genesigmain.gsp
	grails-app/views/layouts/main.gsp
	grails-app/views/search/index.gsp
	grails-app/views/searchHelp/compoundhelp.gsp
	grails-app/views/searchHelp/diseasehelp.gsp
	grails-app/views/searchHelp/geneSigHelp.gsp
	grails-app/views/searchHelp/list.gsp
	grails-app/views/searchHelp/pathwayhelp.gsp
	grails-app/views/searchHelp/trialhelp.gsp
	grails-app/views/trial/_teaAnalysisSummary.gsp
	src/groovy/com/recomdata/gex/GexDao.groovy
	src/groovy/com/recomdata/security/AuthUserDetails.groovy
	src/groovy/com/recomdata/security/IdentityVaultAuthenticationFilter.groovy
	web-app/js/datasetExplorer/datasetExplorer.js
	web-app/js/datasetExplorer/exportData/dataTab.js
	web-app/js/datasetExplorer/workflowStatus.js
	web-app/js/maintabpanel.js