Resolved merge conflict between master and chorevolution branches

vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/client/VsbManagerClient.java

@@ -19,7 +19,6 @@ public class VsbManagerClient{
 
 	private String urlVsbManagerService = null;
 	
-	
 	/**
 	 * Default constructor of the class
 	 * <p>

vsb-manager-api/src/test/resources/gidl/gidl.gidl

 <?xml version="1.0" encoding="UTF-8"?>
 <gidl:GIDLModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gidl="http://eu.chorevolution/modelingnotations/gidl" hostAddress="127.0.0.1" protocol="REST">
   <hasInterfaces role="provider">
-    <hasOperations name="temperature" type="one_way" qos="reliable">
+    <hasOperations name="temperature" type="two_way" qos="reliable">
       <hasScope name="temperature" verb="GET" uri="temperature"/>
      <inputData name="request" context="query" media="json">
       <hasDataType xsi:type="gidl:ComplexType" name="inputDataType" minOccurs="one" maxOccurs="one">