Merge pull request #1 from mung3r/master

sync
Merge pull request #2 from mung3r/master

sync
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from mung3r/master

sync
patched in upstream changes
patched a few more upstream changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
Merge pull request #4 from mung3r/master

sync
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/Herocraft/ecoCreature.git
Merge remote-tracking branch 'upstream/master'
Merge pull request #143 from Herocraft/master

sync
fixed yml reward name parsing bug
Merge branch 'master' into dev

Conflicts:
	src/main/java/se/crafted/chrisb/ecoCreature/rewards/sources/DeathPenaltySource.java
	src/main/java/se/crafted/chrisb/ecoCreature/rewards/sources/PVPRewardSource.java
	src/main/java/se/crafted/chrisb/ecoCreature/settings/RewardSourceFactory.java