Merge branch 'master' into cloud-interface

Change-Id: Id2fa035c6257309fe67772cf74f260d0a0e39a12
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

diff --cc cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/invite/InviteManager.java
Simple merge

diff --cc cloud/interface/src/main/java/org/iotivity/cloud/ciserver/CloudInterfaceServer.java
index e299647,62f0164..a330020
--- 1/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/CloudInterfaceServer.java
--- 2/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/CloudInterfaceServer.java
+++ b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/CloudInterfaceServer.java
@@@ -26,9 -26,8 +26,9 @@@ import java.util.Scanner
  
  import org.iotivity.cloud.base.connector.ConnectorPool;
  import org.iotivity.cloud.base.server.CoapServer;
 +import org.iotivity.cloud.base.server.HttpServer;
  import org.iotivity.cloud.ciserver.DeviceServerSystem.CoapDevicePool;
- import org.iotivity.cloud.ciserver.resources.DiResource;
+ import org.iotivity.cloud.ciserver.resources.RouteResource;
  import org.iotivity.cloud.ciserver.resources.KeepAliveResource;
  import org.iotivity.cloud.ciserver.resources.proxy.account.Account;
  import org.iotivity.cloud.ciserver.resources.proxy.account.AccountSession;

diff --cc cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Account.java
index 7fbb5c0,16494f1..1fd22b7
--- 1/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Account.java
--- 2/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Account.java
+++ b/cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Account.java
@@@ -102,16 -74,10 +102,11 @@@ public class Account extends Resource 
                      mRDServer.sendRequest(
                              MessageBuilder.createRequest(RequestMethod.DELETE,
                                      uriPath.toString(), mRequest.getUriQuery()),
 -                            mSrcDevice);
 +                            new RDReceiveHandler(mRequest, response,
 +                                    mSrcDevice));
                      break;
-                 case CHANGED:
-                 case CONTENT:
-                     mSrcDevice.sendResponse(response);
-                     break;
                  default:
-                     mSrcDevice.sendResponse(MessageBuilder.createResponse(
-                             mRequest, ResponseStatus.BAD_REQUEST));
+                     mSrcDevice.sendResponse(response);
              }
          }
      }

diff --cc cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapLogHandler.java
Simple merge

diff --cc cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapMessage.java
Simple merge