Merge pull request #49 from Windower/master

4.1 sync
Merge pull request #60 from Windower/master

4.0 Sync
Merge pull request #62 from Windower/master

Sync
Azuresets: New spells fix

as well as just switching it back to plugin resources rather than my own
small change
Merge pull request #524 from nitrous24/master

Azuresets Spells Fix