Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku: (30 commits)
  add cost to discount and add registrator model
  fix discounts
  add logo
  add discount to order model, and fixe reports
  replace cs-cart url
  fix partners
  fix deploy file
  fix link
  add links to reports files in admin
  fix deploy.rb
  add ultramarine logo
  replace mymedia logo
  fix no link in wargaming
  add script unload orders in csv
  add download to csv
  replace simtech shop script
  another fix palth
  adaptive fix
  fix users cache
  add rubynoname logo
  ...

Conflicts:
	app/controllers/web/admin/application_controller.rb
	app/views/web/admin/welcome/index.html.haml
	db/schema.rb
	lib/data/timepad_data_helper.rb
Merge branch 'release/v30.0.1'

* release/v30.0.1:

Conflicts:
	app/controllers/web/admin/application_controller.rb
	app/views/web/admin/welcome/index.html.haml
	lib/data/timepad_data_helper.rb