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'
Bugfix for Jira item THRONE-50: Download Exported Job fails
Bugfix for minor bug THRONE-29.
Bugfix for minor bug report THRONE-36. Google Scholar prevents embedding of its page, so this replaces it with an external link to the site to show search results.
Bugfix for bug report THRONE-25.
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.