Merge branch 'master' of https://github.com/ehurem/SI2013Tim5

Conflicts:
	POC/POC1/src/Models/Zahtjev.java
	POC/POC1/src/org/eclipse/wb/swing/Operater/MainOperater.java
Merge branch 'master' of https://github.com/ehurem/SI2013Tim5

Conflicts:
	POC/POC1/src/Models/Zahtjev.java
	POC/POC1/src/org/eclipse/wb/swing/Operater/MainOperater.java