> Hercules merges:
* 620b36d:
Fixing a typo on skill_trap_type description.

* 13317f0:
Spider web no longer triggers on players on non-pvp maps. (bugreport:7234)
(also fixed tab align on switch and a logical thing on skill_additional_effect)

* fc2e159:
@follow will not stop immeadily when turned off, instead of waiting for the current walk path to be complete. (bugreport:6918)

* 638e2b5:
Replaced strncpy with safestrncpy where I found would be beneficial. (bugreport:3080)

* 74ed3ed:
Players in chatrooms can now equip/unequip gear, can talk to NPCS, and can't use consumable items. (bugreport:6097)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17114 54d463be-8e91-2dee-dedb-b68131a5f0ec
* Added a missing checkre() in Hunter job quest (bugreport:7230).
* Fixed item 18103 job and script (bugreport:7137).
* Added a note for where party_share_level is located in conf/battle/party.conf (tid:75137).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17115 54d463be-8e91-2dee-dedb-b68131a5f0ec