Ignoring db binaries
Merge branch 'master' into develop