added database version control
Merge branch 'master' into develop