bug 1131 (sign in page)
Merge branch 'develop' of https://github.com/es-stud-dp-ua/stud-portal into develop

Conflicts:
	Studie/data/test.db.properties