4.x
Fix build of Java-Sbt sample
converting images to PNG
Change SURF to ORB in Java-Sbt sample to remove dependency on external non-free modules