Changes DisasterControl to use factory field
Deprecated EntityFactory.instance()

It should not be used anymore.
Changed ExtinctionProcessorTest to use @Mock