comit_v5 hotfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/hu/uniobuda/nik/vonatxp/R$id.class
	bin/classes/hu/uniobuda/nik/vonatxp/R$layout.class
	bin/classes/hu/uniobuda/nik/vonatxp/R$menu.class
	bin/classes/hu/uniobuda/nik/vonatxp/R$string.class
	bin/classes/hu/uniobuda/nik/vonatxp/R$style.class
	gen/hu/uniobuda/nik/vonatxp/R.java
	res/layout/activity_main.xml