Merge branch 'fix_junit' into 'develop'

Fix junit

See merge request o2oa/o2oa!15

.gitignore

@@ -38,13 +38,13 @@ $RECYCLE.BIN/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 # Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
+**/*.jar
+**/*.war
+**/*.nar
+**/*.ear
+**/*.zip
+**/*.tar.gz
+**/*.rar
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 #jpa enhance class

o2server/store/.gitignore

@@ -1 +0,0 @@
-*.war