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

Conflicts:
	Studie/data/test.db.properties
Merge remote-tracking branch 'origin/develop' into developp