Resolved merge conflict between master and chorevolution branches

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">
+<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="http://cho-noauth-srv.e-mixer.com/" protocol="REST">
   <hasInterfaces role="provider">
-    <hasOperations name="temperature" type="two_way" qos="reliable">
-      <hasScope name="temperature" verb="GET" uri="temperature"/>
+    <hasOperations name="publicTransportation" type="two_way_sync" qos="reliable">
+      <hasScope name="publicTransportation" verb="GET" uri="services/Rest/newsService.svc/latest"/>
      <inputData name="request" context="query" media="json">
       <hasDataType xsi:type="gidl:ComplexType" name="inputDataType" minOccurs="one" maxOccurs="one">
         <hasDataType xsi:type="gidl:SimpleType" name="lat" minOccurs="one" maxOccurs="one" type="double"/>
@@ -22,3 +22,4 @@
     </hasOperations>
   </hasInterfaces>
 </gidl:GIDLModel>
+