Merge branch 'master' into 'master'

Master

See merge request yocj/g4b!9

src/main/View.java

@@ -6,6 +6,8 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import java.util.ArrayList;