Merge remote-tracking branch 'remotes/origin/developer' into developerB

.gitignore

@@ -1,6 +1,4 @@
 /target/**/
-!target/*.war
-!/target/*.war
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
 !**/src/test/**