Revert "Cleanup databases exercises"

This reverts commit 21fde48f2c97b0b3715429800e6f80430bc7961b.
Merge branch 'master' into gh-pages