Vozilo i VoziloDAO modifikovano
Merge branch 'master' of https://github.com/teminagic/SI2013Tim3

Conflicts:
	jMUP/src/main/java/ba/co/edgewise/jmup/daldao/daos/VoziloDAO.java