Merge branch 'hotfix/fix_google_analitycs'

* hotfix/fix_google_analitycs:
  fix ga
Merge branch 'release/v29.2.2'

* release/v29.2.2:
  replace js code of ga
Merge branch 'release/v29.2.3'

* release/v29.2.3:
  fix ga
Merge branch 'develop'
Merge branch 'release/v29.2.4'

* release/v29.2.4:
  replace ga script
  fix account edit in orders view
  fix text
  add discount
  make view
  add discount
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  add time border
remove banner
Merge branch 'hotfix/remove_banner' into develop

* hotfix/remove_banner:
  remove banner
  add time border
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku: