FIX: use handle instead of resouce for item link
FIX: help text is not showing with the correct style
FIX: Add location:l2 to the view more link
FIX: accept the "resouce/hdl:" link
FIX: dryad search tabs order and remove dryadlab tab
Merge remote-tracking branch 'origin/atmire-1446-18' into merge-staging
Merge remote-tracking branch 'origin/atmire-1446-15' into merge-staging
Merge remote-tracking branch 'origin/atmire-1446-16' into merge-staging
Merge pull request #169 from datadryad/atmire-1446-18

FIX: Add location:l2 to the view more link
Merge pull request #170 from datadryad/atmire-1446-15

FIX: dryad search tabs order and remove dryadlab tab
Merge pull request #171 from datadryad/atmire-1446-16

Atmire 1446 16
Merge branch 'dryad-staging' into merge-staging
Merge commit '5652c54' into merge-staging
Merge commit '499c3b9' into merge-staging
Merge commit 'ab1f1e7' into merge-staging

Conflicts:
	dspace/modules/xmlui/src/main/webapp/themes/Mirage/lib/css/style.css
Merge remote-tracking branch 'origin/jima-secondary-cleanup' into merge-staging
Add XML escaping so XSL will parse correctly
Merge pull request #168 from datadryad/atmire-1446-17

FIX: help text is not showing with the correct style
Remove colon and port after dspace.url

dspace.url should already include colon and port.
Add port to dspace.url in dspace.cfg