bug solve
bug solve
Merge branch 'master' of https://github.com/lkrsnik/scrum_app

merge