ispravljen bug: #66
Merge branch 'oldBackup' of https://github.com/teminagic/SI2013Tim3.git into oldBackup

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