Merge branch 'hotfix/banner_rotation' into develop

* hotfix/banner_rotation:
  add allows for banners
  add functional
  fix form account edit
  add banners
  add images

Conflicts:
	app/views/layouts/web/shared/_plaha.html.haml
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  red errors
  add cache clear cap task
  fix logos
  fix og image
  add resque list task
  fix mailer encoding and add stop resque task
  users broadcast and broadcast to admins added
  add preview to broadcasting
  fix facebook sharing
fix tests
Merge branch 'release/v29.2'

* release/v29.2:
  fix tests