* Follow-up r17205, added new mercenary skills and scrolls.
* Updated item_db and some related functions.
* Updated item_trade table.
* Fixed two item scripts with bMagicAtkEle. (bugreport:7385)
* Fixed minor issue in guild storage sample script. (bugreport:7406)

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