Merge origin/master

Conflicts:
	WebContent/WEB-INF/views/experiments.jsp

added geneHeatmap code and a test
Merge origin/master
Merge origin/master

Conflicts:
	WebContent/WEB-INF/views/experiments.jsp

added spring secondaryProject object to config for tests