-Corrected modId for MOD_WEAPON_BASH
-Removed MOD_SPARE 477 and 478 (In use)
-Adjusted MAX_MODIFIER to be 478
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Removed Duplicates from modifier.h and corrected status.lua
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Keyitem name changes.

I had missed a few, so sorry :x

These ones match tool output now.
Merge pull request #96 from TeoTwawki/KI

Keyitem name changes.
Merge pull request #94 from Euda/master

More modifier.h changes
CORE: disable custom time offset, remove CVanaTime::getSysTime() which was applying it - all calls to getSysTime() redirected to built-in time(), derive all vanadiel time related variables from getVanaTime()
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Merge pull request #97 from maxtherabbit/master

CORE: disable custom time offset, remove CVanaTime::getSysTime() which w...
This Yagudo Sentinel was spawned in an invalid position.

It was spawned mid air, client renders the model at ground level on the floor below causing players to wonder why the can walk right up to it yet be told they are too far away to attack.

This change moves it to the ledge next to its mid air position.
Merge pull request #98 from TeoTwawki/tiny-lil-pos-fix

This Yagudo Sentinel was spawned in an invalid position.
CORE: prevent adding entities to enmity list with negative enmity
Merge pull request #99 from maxtherabbit/master

CORE: prevent adding entities to enmity list with negative enmity
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Corrected comments in various files.
Merge pull request #100 from Euda/master

Corrected comments in various files.
SCRIPT: Fixed fame issue with non-existing fame region. (Mhaura uses Windy fame.)
Attempt to script the Devotion Ability for White Mage

Notes:
-Converts 25% of Player's HP to MP for the taret
-Merits add +5% MP recovers (but HP taken stays at 25%)
-Maximum Distance is 10
-Player Cannot Cast on Self
-Stoneskin can absorb the damage if its up

References:
http://wiki.ffxiclopedia.org/wiki/Devotion
http://www.ffxivpro.com/forum/topic/36540/on-healing-hands-a-comprehensive-whm-guide/
Add merit bonuses for Protectra V & Shellra V

Protectra V: Each additional merit point beyond the 1st is supposed to boost the power by 5

Shellra V: Each additional merit point beyond the 1st is supposed to boost the power by 1