optimizacija
Merge branch 'oldBackup' of https://github.com/teminagic/SI2013Tim3 into oldBackup

Conflicts:
	jMUP/src/main/java/ba/co/edgewise/jmup/daldao/daos/OsobaDAO.java
	jMUP/src/main/java/ba/co/edgewise/jmup/mvc/controllers/SalterskiRadnikController.java