modified:   src/Factory.java
	modified:   src/Component_Battle.java
	deleted:    src/Component_Health.java
	modified:   src/Component_Inventory.java
	modified:   src/Component_Item.java
	modified:   src/Component_Movement.java
	modified:   src/Entity.java
	modified:   src/Event.java
	modified:   src/Object_EntityManager.java
	modified:   src/Scene_Level.java
	modified:   src/System_Interaction.java
	modified:   src/System_Movement.java
	src/IShopInventory.java
	src/IShopItem.java
	src/Object_ShopInventory.java
Merge branch 'master' of github.com:propra13-orga/gruppeB1
So, Konstruktor fuer BattleActor erstellt.