branch for SE-150- can be folded into an aggregation branch if need b
SE-150: defensive commit.  fails unit test
SE-150: working copy
SE-150: mostly code complete, need to remove debug code
SE-150 code-complete and unit test updated.
Merging in latest master
Finishing up SE-150
Incorporating Ryan's code comments
Code cleanup and a bit of refactoring
Small fix dealing with the start of a year
Merge branch 'master' into dev/SE-150
Merge branch 'master' into dev/SE-150
Bringing code up to date from a merge from master
Merge remote-tracking branch 'origin/dev/SE-150' into release/2.7.4rc
A fix / kludge for filtering by article types on the home page
Commenting out unit test because hypersql can't parse a criteria query
Fixing se-150
FEND-1217 use author_affiliate field for Author Affiliations search field
fend-1169 feature removal bypass re:se-150
fend-1169 feature removal bypass re:se-150