SE-223: Make urlrewrite.xml match generic DOI prefixes (not just 10.1371)
Merge branch 'master' into dev/SE-223

Conflicts:
	webapp/src/main/webapp/WEB-INF/urlrewrite.xml
SE-223: Fix newly merged instances of hard-coded DOI prefixes
Merge branch 'master' into dev/SE-223
Uncommenting code
Removing duplicate code
A fix for the unit test
FEND-961: PDF Viewing through Browser
fend-989/1039 corrections
Merge branch 'master' into dev/fend-989_take2
Merge remote-tracking branch 'origin/dev/FEND-961' into release/2.6.4rc
Merge remote-tracking branch 'origin/dev/FIXUNITTEST' into release/2.6.4rc

Conflicts:
	queue/src/test/resources/org/ambraproject/queue/SavedSearchRouteMonthlyTest-context.xml
	queue/src/test/resources/org/ambraproject/queue/SavedSearchRouteWeeklyTest-context.xml
increasing maven version to 2.6.4
Merge branch 'master' into dev/SE-223
FEND-1046: Find this article online: spacing edgecase in pone.0006283 references
Merge remote-tracking branch 'origin/dev/FEND-1046' into release/2.6.4rc
Merge remote-tracking branch 'origin/dev/fend-989' into release/2.6.4rc
Merge remote-tracking branch 'origin/dev/SE-223' into release/2.6.4rc
FEND-932:Expression of concern: formatting not carrying over
FEND-932:Expression of concern: formatting not carrying over