Adding in previous changes

Took everything from the soon-to-be-superceded master and merged it into this branch, which does not include built code or configurations.
Merge branch 'master' into build_out_of_source
Added untracked files.

adapt_schema.* and importer/*
Added empty 'bld' dir

Since git only tracks files, added an empty file '.placeholder' in bld.
This way, bld gets created with (essentially) nothing in it.
Now you can 'cd bld' then do 'cmake ..' to build out of the source dirs.