The project now used one database
Merge branch 'master' into dev