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.
Manual merge of new faction system (#256).
Clean up some personal signatures.
Merge pull request #276 from KayenEQ/Development

Fixed compiler warnings and clean up of some code in spell_effects.cpp
(RicardoCampos) End looting before zoning.
Few more minor compilier warnings and code clean up.
Make sure virus is an actual buff before starting timer
Merge pull request #277 from KayenEQ/Development

Few more minor compiler warnings and code clean up.
Revert for checking buffs if virus, a couple of spells don't require a buff.
Merge pull request #278 from KayenEQ/Development

Revert for checking buffs if virus, couple of spells don't require a buff.
Size check on ServerOP_ChannelMessage
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/spell_effects.cpp