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 380 (Removing ndpi from readers list for fs demo)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 390 (Add slf4j-log4j dependency in the test-suite component (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 401 (Trestle fixes (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 402 (Metamorph: fix erroneous channel counts (rebased onto develop))