Merge branch 'verbose-name-fk'
Translate fields in forms
Merge branch 'translate-fields' into develop