Schedule jsp (study, faculty, year)
Merge branch 'develop' of https://github.com/es-stud-dp-ua/stud-portal into developp

Conflicts:
	Studie/data/test.db.properties