Merge branch 'hotfix/fix_haml'

* hotfix/fix_haml:
  fix make up
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

* develop:
  fix program
  fix make_up
Merge branch 'develop'

* develop:
  add new logos
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix
  add facebook link in account
  fix nophoto photo in account
  fix tabs border
fix decorator
output sections
Merge branch 'hotfix/output_sections' into develop

* hotfix/output_sections:
  output sections
my programm is working
fix tests