Fixed merchant price updates.

Fixed fishing in most places.

You can no longer cast a spell on an entity in a different map region (Normal, Water, Lava, etc.)

Capped merchant inventory to 127 charges per stack.

Increased charm break chance rule default to 50.
Merge branch 'master' of https://github.com/cavedude00/Server