nesto
Merge branch 'master' of https://github.com/amustafic2/SI2013TIM9.git
Ponude
Merge branch 'master' of https://github.com/amustafic2/SI2013TIM9.git

Conflicts:
	Implementacija/factpro/src/main/resources/hibernate.cfg.xml
Popravljeni dijelovi za rad sa bazom