Merge branch 'master' into master

648540858

2020-10-26 2fe9e519b42408c07630735ab76e86b999f72948

 .gitignore

@@ -11,7 +11,7 @@
.mtj.tmp/

# Package Files #
*.jar
#*.jar
*.war
*.nar
*.ear