Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'hotfix/edit_admin_orders'

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

* 'master' of github.com:ulmic/nastachku:
  fix javascript
  remove timepad
  schedule fix and user lectures
  fix checkboxes in schedule
  permutation
  fix about input
  fix image
  photo added
  add errors msg to lectures new
  fix adding lectures
  fix tests
  add jquery to votings count
  add count of votings
  add number of ovtings
  add user_lecture votings
  edit lecture 2.0 index
  lecture 2.0 added
edit logos
Merge branch 'hotfix/sponsors' into develop

* hotfix/sponsors:
  edit logos