atmire-2363 - Add support for XMLUI ORCID OAuth Authentication
Merge branch 'versioning' into dryad-master
Make the choice page configurable
Merge branch 'versioning-travis-test' into versioning-new
Add review&archive email addresses when no MS Number
RSOS nopub b/o, PP int=true, biology email changes
changed pub b/o to true for PP
for front page news, stats, and integrated-journals divs, make vertical overflow scroll
Fixes for possible zero-length arrays.
Merge branch 'dryad-master' into versioning-new

Conflicts:
	.travis.yml

dspace/modules/api/src/main/java/org/dspace/identifier/DOIIdentifierProv
ider.java
Merge remote-tracking branch 'upstream/atmire-2363-orcid-oauth-support' into dryad-master
Allow ORCID configuration to be filtered by maven.
removed assistant curator posting
reodered PIs, updated their info
remove # from JAV notifyWeekly and notifyOnArchive
Merge pull request #737 from rnathanday/fb-11996

fb-11996: fix vertical overflow for news feed panel
Added OIK and NJB
Added OIK and NJB
Merge pull request #754 from elizabethdryad/whoweare-employment-updates

Remove AC from Employment page, reorder and update PIs on Who We Are page

OK'ed on dev
changed parsing scheme on amjbot and apps

they use editorial manager, so we're testing to see if the amNat parsing scheme works for them.