Merge branch 'master' into feat/BraillePrintBackEnd-4

 Conflicts:
	.gitignore

.gitignore

 # Gradle
 build
+out
 *gradle*
 !build.gradle
 
@@ -8,4 +9,9 @@ build
 *.iml
 
 # Application
-dummyPrinterConfig.properties
\ No newline at end of file
+dummyPrinterConfig.properties
+
+# Java
+*.class
+*.jar
+*.tar