Merge branch 'hotfix/add_logo_np'

* hotfix/add_logo_np:
  add logo np
Merge branch 'develop'
Merge branch 'develop'
add program
Merge branch 'develop'

* develop: (22 commits)
  add new admin/topics/tests
  add admin/users
  add tests to admin/lecture
  add slot decorator
  add new test and fix other
  add should not create shirt_order test
  should not edit password testt
  refactor user/activate/test
  remove auth_otken trait
  refactor activate user method
  edit activate user test
  add test should not create remind password
  remove unused helpers method
  add should activate user test
  add auth_tokens sequence
  add user/activate test
  try to fix test
  nossl
  fix errnoconnect
  info in pay part/account
  ...
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  add program
Merge branch 'release/stub-orgs'

* release/stub-orgs: (40 commits)
  partners block added
  add new admin/topics/tests
  add admin/users
  add tests to admin/lecture
  add slot decorator
  add new test and fix other
  add should not create shirt_order test
  should not edit password testt
  refactor user/activate/test
  remove auth_otken trait
  refactor activate user method
  edit activate user test
  add test should not create remind password
  remove unused helpers method
  add should activate user test
  add auth_tokens sequence
  add user/activate test
  try to fix test
  nossl
  fix errnoconnect
  ...
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  add program
platidoma removed
Merge branch 'hotfix/platidoma_remove' into develop

* hotfix/platidoma_remove:
  platidoma removed
  add program