Merge branch 'release/0.21' into develop
add lang column to identifier unique constraint
added missing import to common models module
bumbed version number
Merge branch 'release/0.21.1'