Merge branch 'hotfix/edit_configus_time'

* hotfix/edit_configus_time:
  fix tests
  edit time
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix user lectures
  fix cache for unregistred
  client side rendering welcome page
Merge remote-tracking branch 'origin/master'
fix encoding
Merge branch 'hotfix_fix_encoding' into develop