Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.xml
	src/combatmanager/CombatManager.java
	src/combatmanager/models/Combatant.java