Merge branch 'hotfix/bitter_images'

* hotfix/bitter_images:
  done
comparison fixing
Merge branch 'hotfix/fix_email_comparison' into develop

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

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