Resolved merge conflict between master and chovevolution branches

bc-generators/artifact-generators/pom.xml

...a/eu/chorevolution/vsb/artifact/generators/Generator.java

...u/chorevolution/vsb/artifact/generators/JarGenerator.java

...u/chorevolution/vsb/artifact/generators/WarGenerator.java

...orevolution/vsb/artifact/generators/WarGeneratorMain.java

...n/java/eu/chorevolution/vsb/artifact/war/RestServlet.java

...chorevolution/vsb/artifact/war/StartBcManagerServlet.java

...ators/artifact-generators/src/main/webapp/WEB-INF/web.xml

bc-generators/pom.xml

bc-manager/pom.xml

...n/java/eu/chorevolution/vsb/bc/manager/BcManagerRest.java

.../main/java/eu/chorevolution/vsb/bc/manager/VsbOutput.java

.../java/eu/chorevolution/vsb/bc/setinvaddrservice/Base.java

gm-api/pom.xml

gmdl-utils/pom.xml

...java/eu/chorevolution/vsb/gmdl/utils/BcConfiguration.java

.../main/java/eu/chorevolution/vsb/gmdl/utils/Constants.java

...in/java/eu/chorevolution/vsb/gmdl/utils/PathResolver.java

playgrounds/client-server/dpws-playground/pom.xml

playgrounds/client-server/rest-playground/pom.xml