Merge branch 'pregmod-master' into 'pregmod-master'

bin/.gitignore

resources/vector/avatar/amazon.png

resources/vector/avatar/angel.png

resources/vector/avatar/businesswoman.png

resources/vector/avatar/cherub.png

resources/vector/avatar/corrupt.png

resources/vector/avatar/default.png

resources/vector/avatar/fairy.png

resources/vector/avatar/goddess.png

resources/vector/avatar/incubus.png

resources/vector/avatar/monstergirl.png

resources/vector/avatar/pfairy.png

resources/vector/avatar/schoolgirl.png

resources/vector/avatar/shemale.png

resources/vector/avatar/succubus.png

src/gui/Encyclopedia/encyclopedia.tw