Factor out code for determining article type so that it can be shared with Rhino.
Merging in DP code
Merging in latest from DP
A fix for FEND-1295
Code formatting
FEND-1285 fixed logic to display scopus tile
Merge remote-tracking branch 'origin/master' into dev/rhino-article-type
A fix to turn off filtering of article types on the search results page
added 2.8.0 release notes
incrementing maven version to 2.8.0
Merge branch 'dev-search-article-type-fix' into release/2.8.0rc
Merge remote-tracking branch 'origin/dev-FEND-1285' into release/2.8.0rc
updating release notes
Merge remote-tracking branch 'origin/dev/plosone-homepage' into release/2.8.0rc

Conflicts:
	base/pom.xml
	journals/pom.xml
	libs/ambra-emailer/pom.xml
	libs/conf-helper/pom.xml
	libs/dom-ranges-helper/pom.xml
	libs/entity-resolver/pom.xml
	libs/password-service/pom.xml
	libs/pom.xml
	models/pom.xml
	pom.xml
	queue/pom.xml
	webapp/pom.xml
fixing flubbed h tag in release notes
Merge branch 'master' into dev/plosone-homepage
Merge branch 'dev/plosone-homepage' of github.com:PLOS/ambra into dev/plosone-homepage
Updating migration script to match release version
Merge remote-tracking branch 'origin/dev/plosone-homepage' into release/2.8.0rc
Merge branch 'master' into dev-FEND-1219