Merge
Merge branch 'master' of https://github.com/tjkvarda/Pestilence

Conflicts:
	resources/data.xml