Modified scratch
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scratch.R
streaming analysis: generateBlastReport; generateTaxonomyReport; faster LCA
Merge https://github.com/gschofl/metaR

Conflicts:
	man/assignTaxon.Rd
	man/db-functions.Rd