save tgeh metadata
more changes
merging master
refactor metadata methods to work when objects are pre-existing
only try to show filesize when we have one
save the imagefile as well
Merge branch 'js-tidy-search' into js-dsc240
Merge branch 'js-tidy-search' into js-dsc240
Merge branch 'js-tidy-search' into js-dsc240
Merge branch 'js-tidy-search' into js-dsc240
add links to bulkUpload from search
tidy up the upload process for bulk upload
Merge branch 'master' into js-dsc240

Conflicts:
	web/WEB-INF/views/search/collection/searchResults.ftl
Merge branch 'master' into js-dsc240

Conflicts:
	src/banjo/controllers/JobsController.java
clean up code in JobsController getJobFileCopyDetails() to retrieve copy only once.
Merge remote-tracking branch 'origin/master'
Add ACL for sendToDocworks and reorderChildren functionality.
Fix boolean conditions being the wrong way around.
Merge branch 'master' into feature/acm-dsc-766
close fileInputStreams...