Merge branch 'hotfix/hotfix'
English language setted for login and password recovery
Merge branch 'hotfix/hotfix' into develop