minor change in the template results in more space for Figures.
repair test
moved the utils
Fixed broken references afer moving Util.java
Merge remote-tracking branch 'origin/master' into 42-sna-metrics