asd
Merge branch 'master' of https://github.com/amustafic2/SI2013TIM9

Conflicts:
	Implementacija/factpro/src/main/resources/hibernate.cfg.xml
Merge branch 'master' of https://github.com/amustafic2/SI2013TIM9.git
Dodana klasa Ponuda i Editovana klasa BrisanjePonuda