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