merge
Merge git://github.com/EQEmu/Server into Development
Fixed most of the compiler warnings and cleaned up some code in spells_effects.cpp
minor clear up of 2handstaff block effect code.
Merge pull request #276 from KayenEQ/Development

Fixed compiler warnings and clean up of some code in spell_effects.cpp