Merge origin/master

Conflicts:
	src/BLL/EquipmentLogic.java
	src/Entities/Equipment.java
	src/GUI/EquipmentTableModel.java
Merge origin/master
Merge origin/master

Conflicts:
	src/BLL/EquipmentLogic.java
	src/Entities/Equipment.java
	src/GUI/EquipmentTableModel.java