Merge branch 'Gilvanei/master'

Conflicts:
	bin/sprite/spriteBigheadNPC.png
	bin/sprite/spritePegaPegaNPC.png