Signed-off-by:Owen4ever
Merge origin/master

Conflicts:
	src/engine/monica/core/element/ConflictProcesser.java
	src/engine/monica/core/element/ElementConcentrationCalculator.java
	src/engine/monica/core/element/ElementEngine.java
	src/engine/monica/core/map/ObserverInterface.java
	src/engine/monica/core/object/Body.java
	src/engine/monica/core/object/Career.java
	src/engine/monica/core/object/CareerAction.java
	src/engine/monica/core/object/ItemActionList.java
	src/engine/monica/core/object/Race.java
	src/engine/monica/core/object/Role.java
	src/engine/monica/core/object/Skill.java
	src/engine/monica/core/object/Talent.java
	src/engine/monica/core/object/TangibleObject.java
	src/engine/monica/util/annotation/UnOverridable.java