add condition to platidoma approve
Merge branch 'hotfix/edit_admin_orders' into develop

* hotfix/edit_admin_orders:
  add edit order functional
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix schedule
  fix javascript
  remove timepad
  schedule fix and user lectures
  fix checkboxes in schedule
  permutation
fix decorator
Merge branch 'hotfix/sponsors' into develop

* hotfix/sponsors:
  edit logos
add paid function
Merge branch 'develop'

* develop:
  add paid function
  fix decorator
  add condition to platidoma approve
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix schedule