replace ga script
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