Merge remote-tracking branch 'Nipper4369/master' into merge-everything

Conflicts:
	POE-ItemInfo.ahk
	data/Uniques.txt