add mailer and remove dollar to ok
Merge branch 'hotfix/edit_banner'

* hotfix/edit_banner:
  banner edited
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  add mailer and remove dollar to ok

Conflicts:
	app/views/layouts/web/shared/_plaha.html.haml
banner edited
Merge branch 'hotfix/edit_banner_to_mini' into develop

* hotfix/edit_banner_to_mini:
  banner edited
  add mailer and remove dollar to ok