UI
Merge branch 'master' of https://github.com/porcellus/ELTE2014_Szoftverfolyamat2

Conflicts:
	src/com/eltecalendar/TimeTable.java