Merge origin/master

Conflicts:
	src/INFSYS/Adapt/Radnik.java
	src/INFSYS/BusinessBeans/SSavetnikPerformanse.java
	src/INFSYS/queries/INFSistemQuery.java
Merge origin/master

Conflicts:
	src/INFSYS/Adapt/Radnik.java
	src/INFSYS/BusinessBeans/SSavetnikPerformanse.java
	src/INFSYS/queries/INFSistemQuery.java
Merge 10042014_JavaLibraryINFSISTEM_OMNIA od 10.4.2014

Conflicts:
	src/INFSYS/queries/INFSistemQuery.java