MAX_NPC_CLASS2_END updated to latest ID. Added more NPC constants.
Fixed issue with Biochemist that resulted in never regaining Bioethics.
Merge branch 'master' of https://github.com/HerculesWS/Hercules into Hercules
Merge branch 'Hercules' into LocalPC
Merge branch 'LocalPC' into Server
Custom Items 24k to 30k

Modified   db/item_db2.conf
Custom Item bonuses forgot to activate from 24k to 30k

Modified   npc/custom/masonro/functions.txt
Merge branch 'LocalPC' into Server