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

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

* 'develop' of github.com:ulmic/nastachku:
  fix
Merge branch 'hotfix/fix_mailing_with_other_users' into develop

* hotfix/fix_mailing_with_other_users:
  add reason to give ticket to form admin
  fix uploader
  fix logo
  fix looking for emails
  add logos
  add logos
  fix mailing

Conflicts:
	app/controllers/web/admin/users_lists_controller.rb
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
edit users lists index
add strip when email comparison
Merge branch 'release/v30.2'

* release/v30.2:
  add strip when email comparison
  edit users lists index
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  agregate deployng resque
add creating prom
add logo
Merge branch 'hotfix/fix_creating_promo'

* hotfix/fix_creating_promo:
  add logo
  add creating prom