Merge branch 'master' into develop
Fixed wrong db version
Merge branch 'develop'