Merge branch 'hotfix/fix_mailing'

* hotfix/fix_mailing:
  fixed
Merge branch 'release/v30.1.1'

* release/v30.1.1:
  rename
  add good title
Merge branch 'release/v30.1.2'

* release/v30.1.2:
  fix locales
  fix
Merge branch 'release/v30.1.3'

* release/v30.1.3:
  fix
Merge branch 'release/v30.1.4'

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

* 'develop' of github.com:ulmic/nastachku:
  fix
fix mailing
add logos
add logos
fix looking for emails
fix logo
fix uploader
add reason to give ticket to form admin
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: