Nothing special
Merge branch 'master' of https://github.com/alvarogonzalezsotillo/test-evaluation

Conflicts:
	src/samples/scala/samples/StepsProgressSample.scala
	src/testimages/stitch/models.ppt
Merge branch 'master' of https://github.com/alvarogonzalezsotillo/test-evaluation

Conflicts:
	src/samples/scala/samples/StepsProgressSample.scala
FourCornersEngine now works, but not as well as expected