added alternate backfill type
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	db/schema.sql
fixed mnerge issues