Bugfix #946
Merge branch 'develop' of https://github.com/es-stud-dp-ua/stud-portal into develop