merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 342 (setId performance improvements)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 351 (Add SPW support to FakeReader)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 374 (Add method to retrieve the significant directory count)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 378 (Sprint5 bug fixes (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 380 (Removing ndpi from readers list for fs demo)