Merge branch 'develop'
Merge branch 'hotfix/fix_email_comparison'

* hotfix/fix_email_comparison:
  comparison fixing
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix pages show
Merge branch 'develop'

* develop:
  comparison fixing
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
add rails.env to mailing
Merge branch 'hotfix/fix_email_comparison_2' into develop

* hotfix/fix_email_comparison_2:
  add rails.env to mailing
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix page type
  minimize mymedia logo