Merge origin/master

tdebatty · tdebatty · commit a61d6ba5209f · 2015-04-07T10:12:15.000+02:00
Conflicts:
	src/main/java/info/debatty/java/stringsimilarity/KShingling.java
diff --git a/src/main/java/info/debatty/java/stringsimilarity/KShingling.java b/src/main/java/info/debatty/java/stringsimilarity/KShingling.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.regex.Pattern;
+import java.util.Set;
 
 /**
  * A k-shingling is a set of unique k-grams, used to measure the similarity of 
