Changelog update for the mobs on fire system
Merge remote-tracking branch 'remotes/upstream/master' into ergo_mobs_on_fire

Conflicts:
	html/changelog.html
Solved merge issues in the changelog
Merge pull request #1470 from Ergovisavi/ergo_mobs_on_fire

Changelog update for the mobs on fire system