deal with derivative creation better
Merge branch 'master' into js-dsc240
move call to remove old derivative.  fix derviative creation instead.
only suspend ambersession once
tidy methodcall and let import restart after failing
Merge branch 'master' into js-dsc240

Conflicts:
	src/banjo/controllers/BulkUploadJobsController.java
neaten a few things
changes for defects
Merge branch 'master' into js-dsc-865

Conflicts:
	pom.xml
	src/banjo/controllers/BulkUploadJobsController.java
add other job types
refactor metadata saving methods. Also start to add identify screen
move jobFIle selectors to identify
redirect to up[l;oad after identify
tidy up
Merge branch 'master' into js-dsc-865
add identify screen
tidy, make getCollectionLu work again...
add software and devices
save software and device
display software and device