Merge branch 'hotfix_add_logo'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/v30'

* release/v30:
  fix uploading
  fix something
  send mail to new users
  add functional for new users
  edit view for users lists
  add functional for unusers
  add reason to view
  add description and reason to users_list and users
  add buttons to table with users
  fix views for users_lists
  add users lists model
  fix view
  add uploading file to code
  add route for users_lists
  replace timepad data helper
  add users_list upload
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' 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
Merge branch 'release/v30.0.2'

* release/v30.0.2:
  fix uploading lists
Merge branch 'release/v30.1'

* release/v30.1:
  add mailing
fix sending mail
Merge branch 'hotfix/add_send_mail' into develop

* hotfix/add_send_mail:
  fix sending mail