temp commit
Merge branch 'master' into nn-dsc-258-240
Merge branch 'master' into nn-dsc-258-240

Conflicts:
	src/banjo/controllers/BulkUploadJobsController.java
	web/WEB-INF/views/jobs/bulkUpload/new.ftl
Merge branch 'js-dsc-865' of https://github.com/nla/banjo into nn-dsc-258-240
Merge branch 'master' into nn-dsc-258-240
minor changes
Merge branch 'master' into nn-dsc-258-240
hide button unless admin,  only add jobFiles for works that exist currently.
defects.  add original role. only show button for autherised access. only allow access to corec users for upload
More changes. Working with a few bugs
Merge branch 'master' into nn-dsc-258-240

Conflicts:
	web/WEB-INF/views/bibData/identify_bib_item.ftl
	web/WEB-INF/views/works/show.ftl
address identify defects
store bibId against pages as well
Merge branch 'master' into js-dsc-913
add tilePostition
Remove test accounts for the TEST environment.
changes from p[r feedback
Fixed edit screen
Merge branch 'master' into nn-dsc-258-240
Merge pull request #800 from nla/js-dsc-913

Js dsc 913