Merge pull request #1188 from mtbc/rebased/develop/sql-names

fix SQL script naming explanation (rebased onto develop)
Merge pull request #1183 from mtbc/fileannotation-npe

fix NPE in indexing file annotations
Merge pull request #1172 from ximenesuk/chgrp-delete-fileset-tests

Add tests that use Fileset as the root.
Update submodules