Switched to Grunt; Fixed XIVDB tooltip error for #128, may also solve #129
merge conflict resolution
Merge branch 'master' of https://github.com/Tickthokk/ffxiv-caas
Merge pull request #130 from Tickthokk/master

XIVDB Tooltip Fix