adding in check screen
change allowed file types for upload. add check and edit screens
deal with folder upload. add edit
Merge branch 'js-dsc-242' of github.com:nla/banjo into js-dsc-242

Conflicts:
	web/WEB-INF/views/jobs/upload.ftl
	web/WEB-INF/views/jobs/uploadForm.ftl
	web/WEB-INF/views/jobs/uploadedFile.ftl
deal with non image uplaods
Merge branch 'master' into js-dsc-242
eclipse organise imports
use jobPages for bulkUpload
dsc-398 interface
manual merge
manual merge
Update show.ftl
Update show.ftl
Update show.ftl
added comments to method and fixed a comparison
Merge pull request #830 from nla/sc-dsc-698-recurse-del

Sc dsc 698 recurse del
handle incompatibe file types
Merge branch 'master' into js-dsc-242

Conflicts:
	src/banjo/controllers/ReprocessController.java
remove debug
handle null jobfiles