Merge branch 'hotfix/staging_database' into develop

* hotfix/staging_database:
  staging user changed
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
Merge branch 'hotfix/work_dir' into develop

* hotfix/work_dir:
  revert last commit
Merge branch 'hotfix/new_db' into develop

* hotfix/new_db:
  staging db changed
Merge branch 'hotfix/staging_user_test' into develop

* hotfix/staging_user_test:
  user changed back
Merge branch 'hotfix/staging_branch' into develop

* hotfix/staging_branch:
  changed staging branch
remove lectures from lk and afterparty link from shirt_orders
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop'