Merge branch 'master' of https://github.com/HerculesWS/Hercules
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Merge branch 'master' of https://github.com/HerculesWS/Hercules
* Fixed bugreport:7713
http://hercules.ws/board/tracker/issue-7713-bnogemstone-reverted/
Per official behavior, Mistress card effect removes all gemstone requirements on all skills EXCEPT Hocus Pocus and Ganbantein.
Merge branch 'master' of https://github.com/shenhuyong/GHBB
Revert "Merge branch 'master' of https://github.com/shenhuyong/GHBB"

This reverts commit f01cb94810213ca1793ac8415f11fc4fc83ba326, reversing
changes made to f2d4f810babaca588047219d026623c56aaeb572.