Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfix/fix_creating_promo' into develop

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

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

* hotfix/bitter_images:
  done
fix pages show
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop'