tests and small fixes
Merge branch 'master' of github.com:ZimonD/ContextCG7

Conflicts:
	src/server/src/main/java/disastercontrol/entity/component/Power.java
Merge branch 'master' of github.com:ZimonD/ContextCG7