Changed methods in FireGenerator to private
Added test class for FireGenerator
Added asserts to FireGenerator constructor
Added powermock dependency to pom.xml
Changed DisasterControl for new contructor

Of FireGenerator.
Changed FireProcessor to use supplied Random
Added two tests for FireGenerator
World in HeightChangerTest is now mocked
Merge branch 'test-firegenerator'

Conflicts:
	src/server/src/main/java/disastercontrol/DisasterControl.java
Height changer smoothing limited
Javadoc added
JavaDoc fixes.
Fixed merge conflicts.
Added, fixed and updated JavaDoc.

Also fixed code layout / style in some classes.
merging with master
fixed some comments and problems arising from merge
premerge with master branch with hopefully concurancy fix