One more small token change from working on resumable
WIP: resumable token table, models, controller skeleton
DeferredAction thing, untested
Add site-specific deferrals to handle exceptions
Resumable block handling (octet only), no completion
More resumable upload controller changes, including test
Merge branch 'master' into resumable
Evolution for upload schema
Add resumable.js dependency

Apparently there's no minified version?
new resumableService, added to pageService. no meaningful content yet
Merge remote-tracking branch 'github/master' into resumable

Conflicts:
	conf/evolutions/default/59.sql => 62.sql
asset.scala add read mode permissions to two locations
Merge branch 'resumable' of github.com:databrary/databrary into resumable
Create upload dir on start, why not
Merge remote-tracking branch 'github/master' into resumable

Conflicts:
	build.sbt
	conf/evolutions/default/62.sql -> 63.sql
merge
merge fix
resumable used on volumeEditMaterialsForm
resumable config changes requested by dylan
Merge branch 'master' into resumable