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
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
Fixed edit screen
Merge branch 'master' into nn-dsc-258-240
updated migration sequence.
merge in latest updates.
Merge pull request #802 from nla/nn-dsc-258-240

Nn dsc 258 240