Merge branch 'master' into master

build.gradle

@@ -19,8 +19,15 @@ sourceSets {
     }
 }
 
+targetCompatibility = '1.8'
+sourceCompatibility = '1.8'
+
+compileJava {
+	options.encoding = "UTF-8"
+}
+
 task fatJar(type: Jar) {
     baseName = project.name + '-all'
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
-}
+}