reformatted spells.cpp. refactored reagent code for bard instruments, pet reagents and pet focus items. This splits the loop for focus items and consumable components so that Greater Conjuration: pets do not require their associated elemental mastery staff. This happens because the second component is -1 and the second focus item is the staff in the db.
undo last changes and reformat only.
rollback mob.h with formatting changes
Merge remote-tracking branch 'upstream/master' into reagentPhase2_fix
hopefully I just took the source but here goes!
Conflicts:
	zone/spells.cpp
reformatting doc with latest changes from upstream/master
spell reagent and bard instrument refactoring after the document formatting
removed formatting. added changes, again.
Merge pull request #256 from bwilliams1/reagentphase2_fix

Reagentphase2 fix