Merge "Merge branch 'easysetup'"

diff --combined service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
index 8b560f0,e233d74..0ede8c2
--- 1/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
--- 2/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
+++ b/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
@@@ -55,14 -55,14 +55,17 @@@ public
          if (m_task) m_task->cancel();
      }
  
 +    ScopedTask(ScopedTask&&) = default;
 +    ScopedTask& operator=(ScopedTask&&) = default;
 +
      RCSDiscoveryManager::DiscoveryTask* operator->()
      {
          return m_task.get();
      }
  
+     ScopedTask(ScopedTask&&) = default;
+     ScopedTask& operator=(ScopedTask&&) = default;
+ 
  private:
      DiscoveryTaskPtr m_task;
  };

diff --combined tools/tizen/.gbs.conf
index 88e8cf9,9235ad7..88e8cf9
mode 100644,100755..100755
--- 1/tools/tizen/.gbs.conf
--- 2/tools/tizen/.gbs.conf
+++ b/tools/tizen/.gbs.conf
@@@ -27,10 -27,10 +27,10 @@@ url = https://api.tizen.or
  #Repo section example
  [repo.public_latest]
  #Build against repo's URL
 -url = http://download.tizen.org/snapshots/2.4-mobile/common/tizen-2.4-mobile_20160106.1/repos/target-TM1/packages/
 +url = http://download.tizen.org/snapshots/2.4-mobile/common/latest/repos/target-TM1/packages/
  #Optional user and password, set if differ from profile's user and password
  #user =
  #passwd =
  
  [repo.devel-gcc49-base]
 -url = http://download.tizen.org/releases/2.4/2.4-base/tizen-2.4-base_20151027.1/repos/standard/packages/
 +url = http://download.tizen.org/releases/2.4/2.4-base/tizen-2.4-base_20151027.1/repos/standard/packages/