Merge branch 'master', remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Adding a datasource that uses the local filesystem for storage.
Merge pull request #5 from danbev/db-update-issue

DB update issue