modified:   grails-app/conf/BootStrap.groovy
	modified:   grails-app/conf/BuildConfig.groovy
	modified:   grails-app/conf/Config.groovy
	modified:   grails-app/conf/DataSource.groovy
	modified:   grails-app/controllers/org/hits/ui/AdminController.groovy
	modified:   grails-app/controllers/org/hits/ui/ExperimentController.groovy
	modified:   grails-app/controllers/org/hits/ui/LabController.groovy
	modified:   grails-app/controllers/org/hits/ui/TemplateController.groovy
	modified:   grails-app/domain/org/hits/parser/ParserDef.groovy
	modified:   grails-app/domain/org/hits/parser/SourceDef.groovy
	modified:   grails-app/domain/org/hits/ui/Experiment.groovy
	modified:   grails-app/domain/org/hits/ui/Knowledge.groovy
	modified:   grails-app/domain/org/hits/ui/Template.groovy
	modified:   grails-app/domain/org/hits/ui/TemplateToParserDef.groovy
	modified:   grails-app/services/org/hits/parser/ParserService.groovy
	modified:   grails-app/views/ui/admin/index.gsp
	modified:   grails-app/views/ui/user/_templateSelec.gsp
	modified:   grails-app/views/ui/user/_templateSelec2.gsp
	modified:   grails-app/views/ui/user/index.gsp
	modified:   grails-app/views/ui/user/uploadr.gsp
	modified:   src/groovy/org/hits/parser/excelimp/ParserFactory.groovy
	modified:   src/groovy/org/hits/parser/excelimp/RawDataExcelParser.groovy
	modified:   src/groovy/org/hits/parser/excelimp/SetupExcelParser.groovy
	modified:   src/groovy/org/hits/ui/KnowledgeFetcher.groovy
	modified:   web-app/css/index.css
	deleted:    web-app/raw/7552630946023setup_test.xls
	grails-app/domain/org/hits/ui/ExperimentToParserDef.groovy
	grails-app/domain/org/hits/ui/Stage.groovy
	grails-app/services/org/hits/parser/ExperimentParsersConfigService.groovy
	grails-app/views/ui/admin/_stageoptions.gsp
	grails-app/views/ui/user/_templateSelec3.gsp
	web-app/images/ui/samples.png
	web-app/images/ui/star.png
	new file:   grails-app/domain/org/hits/ui/ExperimentToParserDef.groovy
	new file:   grails-app/domain/org/hits/ui/Stage.groovy
	new file:   grails-app/services/org/hits/parser/ExperimentParsersConfigService.groovy
	new file:   grails-app/views/ui/admin/_stageoptions.gsp
	new file:   grails-app/views/ui/user/_templateSelec3.gsp
	new file:   web-app/images/ui/samples.png
	new file:   web-app/images/ui/star.png
Merge branch 'master' of git://github.com/excemplify/immunoblot

Conflicts: