atmire-2062:change the seach query filter from type=2(item) to type=0(bitstream)
atmire-2062:fix the query
Add shopping cart into checkout main pannel
atmire-2175:Add status check on credit card charge step
1763 : only allow one waiver between vouchers and counrties
2194 : Don't show shopping cart on initial page
Merge pull request #480 from datadryad/atmire-1832-only

atmire-1832 : Add shopping cart into checkout main panel
 Verify identifier is doi before building resource/doi link in single result AbstractFiltersTransformer
Ignore spaces and extra characters after manuscript numbers
Correct problems with editing shopping cart

Most of these changes improve debugging output for the shopping
cart. The primary change of substance is PaymentSystemImpl line 309,
where we needed to check the country for null so the update
transaction can complete.
Merge remote-tracking branch 'origin/atmire-2175' into test-atmire-2175
Improve wording
Merge branch 'dryad-master' into integration
Update name of CompCytogen
Merge pull request #497 from datadryad/integration

Update umlaut characters in the config
Merge remote-tracking branch 'origin/trello-143-editShopping' into dryad-master

Conflicts:
	dspace/modules/payment-system/payment-api/src/main/java/org/dspace/paymentsystem/PaymentSystemImpl.java
Correct behavior of FAQ page
Merge pull request #482 from datadryad/atmire-1763-fix-one-waiver

Atmire 1763 fix one waiver
Merge pull request #483 from datadryad/atmire-2062

Atmire 2062 : Improvements for Solr Query Filters
Merge pull request #498 from datadryad/fix_treebase_links

Fix links to TreeBASE and KNB in search results and item pages