deleted folder db
deleted file derby.log
Revert "deleted file derby.log"

This reverts commit 39d75c33810da27dc57c8ae0a425d6a59621972f.
Revert "Revert "deleted file derby.log""

This reverts commit 0b68eab0946f263cca8f87b8630c3c31e46f7086.
Revert "Revert "Revert "deleted file derby.log"""

This reverts commit deb5eb80ab0f0cfd67d9c461529d91184ef39402.
Merge origin/master