Bring Imperial Heatmap Back
Merge remote-tracking branch 'refs/remotes/origin/f.guitton'
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/github/ImperialBranch'

Conflicts:
	web-app/js/datasetExplorer/exportData/dataTab.js
Merge remote-tracking branch 'refs/remotes/github/ImperialBranch'
Merge remote-tracking branch 'refs/remotes/github/ImperialBranch'
Merge remote-tracking branch 'refs/remotes/github/ImperialBranch'
fixed line ending problems - once again
Merge branch 'ImperialBranch'
Git Attributte modification
Grails Update to 2.2.3
Analysis Controller null pointer check
Adding resource object
Generating WebXML configuration file
Fixing declaration problem with nullable constrains on boolean
Removing irrelevant version object
Adding maven configuration file
Updating ehcache configuration to fix grails 2.x loaing warning.
R module decoupling
CSS corrections