Removed hardcoded db prefix, fixes #8
Merge branch 'master' into Refactoring-files
files template