minor wording and style fixes.  Also fix folder uplaod for bulk-upload
handle uploads more gracefully
Merge branch 'js-dsc-242' into js-dsc-987
tidy
standardise url format
fix edit buttons for bulk_upload jobs
Merge branch 'master' into js-dsc-987
add blob id info for bss. tidy view
Merge branch 'master' into js-dsc-987

Conflicts:
	src/banjo/controllers/NonCollectionMaterialUploadController.java
pull out blobid stuff. bss can use the cli.
initialise tika once.
Merge pull request #832 from nla/js-dsc-987

Js dsc 987, merged.
included review suggestion to have business rules for image displays defined and managed in an image controller.
Merge remote-tracking branch 'origin/master' into dsc-287