svega nesto
Merge branch 'master' of https://github.com/teminagic/SI2013Tim3

Conflicts:
	jMUP/src/main/java/ba/co/edgewise/jmup/mvc/controllers/BossController.java
	jMUP/src/main/java/ba/co/edgewise/jmup/mvc/controllers/SalterskiRadnikController.java
	jMUP/src/main/java/ba/co/edgewise/jmup/mvc/views/BossView.java
Merge branch 'master' of https://github.com/teminagic/SI2013Tim3