Neki se matram
Merge branch 'master' of https://github.com/nbizja/sp

Conflicts:
	build/classes/eStudent/beans/PredmetnikBean.class
	src/eStudent/beans/PredmetnikBean.java
krneki
Juhu