Another commit
Merge branch 'master' of https://github.com/besulzbach/realmsofmoira

Conflicts:
	src/core/Data.java
	src/creatures/Creature.java
	src/creatures/roles/Warlock.java