Dodana modifikacija korisnika
Merge branch 'master' of https://github.com/farisca/SI2013Tim1

Conflicts:

	Implementacija/jKP/src/main/java/ba/unsa/etf/si/tim1/Hibernate/HibernateZaposlenik.java