Merge branch 'master' into recordSystem

# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java

FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java

@@ -79,7 +79,7 @@ public class FightScoreboard {
             RecordSystem.scoreboardTitle(fightTeam.getColoredName());
         fightTeam.getPlayers().forEach(fp -> {
             if(fp.isLiving())
-                setScore(fightTeam.getPrefix() + fp.getPlayer().getName(), (int) fp.getPlayer().getHealth());
+                objective.getScore(fightTeam.getPrefix() + fp.getPlayer().getName()).setScore((int) Math.ceil(fp.getPlayer().getHealth()));
         });
     }