Merge branch 'master' into Item-Refactoring

Conflicts:
	GameEngine_Core/com/clinkworks/gameengine/api/GameBase.java
	GameEngine_Core/com/clinkworks/gameengine/api/PlayerCharacterBase.java
	GameEngine_Core/com/clinkworks/gameengine/components/Inventory.java
	GameEngine_Core/com/clinkworks/gameengine/datatypes/TestItem.java
	GameEngine_Core/com/clinkworks/gameengine/datatypes/Weapon.java
	GameEngine_Core/com/clinkworks/gameengine/datatypes/items/Item.java
	GameEngine_Core/com/clinkworks/gameengine/util/GameComponentFactory.java
	src/com/clinkworks/gameengine/datatypes/StatAttributes.java