Merge branch 'hotfix/stub_remove'

* hotfix/stub_remove:
  stub removed
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'hotfix/fix_main_page'

* hotfix/fix_main_page:
  fix main page
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
edit .gitignore
add logos
Merge branch 'hotfix/add_logos' into develop

* hotfix/add_logos:
  add logos
  edit .gitignore