Merge branch 'hotfix/fix_make_up'

* hotfix/fix_make_up:
  fixed
fix ga
Merge branch 'hotfix/fix_google_analitycs' into develop

* hotfix/fix_google_analitycs:
  fix ga