Merge branch 'master' of https://github.com/kwwall/esapi-java-legacy. Merging Dave Wicher's changes to ExtensiveEncoderURITest.java for Java 7 compilation error.

Author: kwwall

src/test/java/org/owasp/esapi/reference/ExtensiveEncoderURITest.java

@@ -4,6 +4,7 @@
 
 import java.io.File;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +37,7 @@ public static Collection<String> getMyUris() throws Exception{
 		String fileName = url.getFile();
 		File urisForText = new File(fileName);
 
-		inputs = Files.readAllLines(urisForText.toPath());
+		inputs = Files.readAllLines(urisForText.toPath(), StandardCharsets.UTF_8);
 
 		return inputs;
 	}