Fixed migrations error + renamed database.local.properties
Merge branch 'feature/migration-fix' into dev