Merge branch 'master' into cloud-interface

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

diff --combined cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
index 1168093,858e7ed..a282d13
--- 1/cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
--- 2/cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
+++ b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
@@@ -30,8 -30,7 +30,8 @@@ import org.iotivity.cloud.accountserver
  import org.iotivity.cloud.accountserver.resources.acl.group.GroupResource;
  import org.iotivity.cloud.accountserver.resources.acl.id.AclResource;
  import org.iotivity.cloud.accountserver.resources.acl.invite.InviteResource;
 -import org.iotivity.cloud.accountserver.resources.certificate.CertificateResource;
 +import org.iotivity.cloud.accountserver.resources.credprov.cert.CertificateResource;
 +import org.iotivity.cloud.accountserver.resources.credprov.crl.CrlResource;
  import org.iotivity.cloud.base.ServerSystem;
  import org.iotivity.cloud.base.server.CoapServer;
  import org.iotivity.cloud.util.Log;
@@@ -63,16 -62,14 +63,18 @@@ public class AccountServer 
  
          serverSystem.addResource(new GroupResource());
  
+         serverSystem.addResource(new AclResource());
+ 
          serverSystem.addResource(new CertificateResource());
  
 +        serverSystem.addResource(new CrlResource());
 +
 +        serverSystem.addResource(new AclResource());
 +
          serverSystem.addResource(new InviteResource());
  
 -        serverSystem.addServer(new CoapServer(new InetSocketAddress(Integer
 -                .parseInt(args[0]))));
 +        serverSystem.addServer(new CoapServer(
 +                new InetSocketAddress(Integer.parseInt(args[0]))));
  
          boolean tlsMode = Integer.parseInt(args[1]) == 1;