Fix angular version
Merge branch 'hotfix/fix-angular-version'
Merge branch 'master' into develop