Merge branch 'master' into dev-search-article-type-fix
Variable name change
Updates to fix bugs with the article type filter and facet
Rename MockCache to EternalCache, and move it from tests into main.

This is because I'm starting work on taxonomy serving code in rhino, and for the first cut, I want to use a very simple cache like this.  Longer-term we plan on using memcache instead of ehcache.
Merge branch 'master', remote-tracking branch 'origin'
dev-amec-1936 twitter card striking image
dev-AMEC-1936 code review changes
AMEC-1757 added links to the FigShare tooltip table
replaced the tooltip widget with the dialog widget because the tooltip disappears as the user tries to click on the links
AMEC-1757 added the css for the figshare dialog widget
AMEC-1757 added a new custom-built jQuery UI javascript file (version: 1.9.2)
The css file for the jQuery UI (version: 1.9.2) -- Not included yet
Merge remote-tracking branch 'origin/master' into dev-amec-1936
Merge branch 'master' into dev-AMEC-1757

Resolved a conflict

Conflicts:
	webapp/src/main/webapp/javascript/alm.js
Added a comment to specify the source of the code
AMEC-1757 fixed the link for the SI files
AMEC-1757 changed the color of the figshare table links from black to #3C63AF
AMEC-1757 refactored couple of variable names
Merge branch 'dev-amec-1936' into release/2.9.0rc
set version in poms to 2.9.0
AMEC-2028: show the author supplied doi in the references