Merge branch 'hotfix/fix_make_up' into develop

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

* hotfix/fix_google_analitycs:
  fix ga
replace js code of ga
Merge branch 'release/v29.2.2'

* release/v29.2.2:
  replace js code of ga