Schedule jsp (study, faculty, year)
Merge remote-tracking branch 'origin/develop' into developp

Conflicts:
	Studie/data/test.db.properties
	Studie/src/main/resources/messages_en.properties
	Studie/src/main/resources/messages_ru.properties