merge develop -D org -I include -E exclude: PR 499 (Code changes for new schema)
merge develop -D org -I include -E exclude: PR 506 (Memoizer: use Location instead of File to represent 'id')
merge develop -D org -I include -E exclude: PR 510 (CellomicsReader: Improve performance of initFile (develop))
merge develop -D org -I include -E exclude: PR 512 (xsd-fu: Extend C++ support to generate headers and include guards)