For LocalPC IP

Modified   conf/char-server.conf
Modified   conf/map-server.conf
Modified   conf/subnet.conf
Some errors setting the IP and "npc_market_data_db: npc_market_data" for inter-server.conf

Modified   conf/inter-server.conf
Modified   conf/subnet.conf
1.) Get ItemDB from rAthena - Done but failed
2.) Get MobDB from rAthena - Done and success!
3.) Convert ItemDB2 descriptions iteminfo.lua - Done and success!
4.) Convert ItemDB2 to SQL - Done and success!
5.) Quests Updates:

	EP 13.1
	Dewata
	El Dicastes
	Eclage

6.) Quest Database - Updated
7.) Added NPC Quests:

	Ninja Quests - Quests for Kagerou/Oboro weapons and armor.
	Lighthalzen Quests - Quests related to Lighthalzen City.

8.) Update 24000 range sql
9.) Added quest
	Mean Man: Halter Lead 30 Day Box

Modified   Hercules-10.sln
Modified   conf/battle/misc.conf
Modified   db/cashshop_db.conf
Modified   db/item_db2.conf
Modified   db/quest_db.txt
Modified   db/re/item_trade.txt
Modified   db/re/map_zone_db.conf
Modified   db/re/mob_boss.txt
Modified   db/re/mob_db.txt
Modified   npc/custom/masonro/Emistry_Scripts_2k14/Advance_Stylist_4.3.txt
Modified   npc/custom/masonro/mall.txt
Modified   npc/custom/masonro/warper.txt
Modified   npc/re/quests/quests_13_1.txt
Modified   npc/re/quests/quests_dewata.txt
Modified   npc/re/quests/quests_dicastes.txt
Modified   npc/re/quests/quests_eclage.txt
Modified   npc/re/quests/quests_mora.txt
Modified   npc/re/scripts.conf
Modified   npc/scripts_custom.conf
Modified   sql-files/item_db2.sql
Modified   sql-files/item_db_re.sql
Add        npc/custom/masonro/quests/mount.txt
Add        npc/re/quests/ninja_quests.txt
Add        npc/re/quests/quests_lighthalzen.txt
Merge branch 'LocalPC' into Server

Conflicts:
	conf/char-server.conf
	conf/map-server.conf
	conf/subnet.conf