Merge branch 'group-manager'

Conflicts:
	service/SConscript

Change-Id: I583ef696a20ee406c2d6c17a79daabb0cbbf83d5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

diff --combined resource/docs/Doxyfile
index 6857776,4a56ad0..363635a
--- 1/resource/docs/Doxyfile
--- 2/resource/docs/Doxyfile
+++ b/resource/docs/Doxyfile
@@@ -674,11 -674,12 +674,13 @@@ INPUT                  = . 
                           ../../service/resource-hosting/include \
                           ../../service/resource-container/include \
                           ../../service/resource-container/bundle-api/include \
 -                         ../../service/things-manager/sdk/inc \
 +                         ../../service/things-manager/sdk/inc/ThingsConfiguration.h \
 +                         ../../service/things-manager/sdk/inc/ThingsMaintenance.h \
                           ../../service/easy-setup/sdk/common \
                           ../../service/easy-setup/sdk/enrollee/api \
-                          ../../service/resource-directory/include
+                        ../../service/resource-directory/include \
+                        ../../service/scene-manager/include \
+                        
  
  # This tag can be used to specify the character encoding of the source files
  # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --combined service/SConscript
index 2e6e25f,830ee08..da5062e
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript
@@@ -36,9 -36,14 +36,13 @@@ if target_os not in ['arduino','darwin'
      # Build resource-encapsulation project
      SConscript('resource-encapsulation/SConscript')
  
-     # Build resource-container project    
++    # Build resource-container project
 +    SConscript('resource-container/SConscript')
 +
+     # Build scene-manager project
+     if target_os in ['linux']:
 -      SConscript('scene-manager/SConscript')
 -
 -    # Build resource-container project
 -    if target_os not in ['android']:
 -        SConscript('resource-container/SConscript')
++        SConscript('scene-manager/SConscript')
+ 
      # Build simulator module
      if target_os in ['linux'] and env.get('SIMULATOR', False):
          SConscript('simulator/SConscript')
@@@ -48,6 -53,7 +52,6 @@@
          SConscript('resource-directory/SConscript')
  
  # Build EasySetup module
 -if target_os in ['arduino','android', 'linux']:
 +if target_os in ['arduino', 'android', 'linux','tizen']:
      SConscript('easy-setup/SConscript')
  
 -      

diff --combined tools/tizen/.gbs.conf
index 88e8cf9,4fc2afe..4fc2afe
mode 100755,100644..100755
--- 1/tools/tizen/.gbs.conf
--- 2/tools/tizen/.gbs.conf
+++ b/tools/tizen/.gbs.conf
@@@ -9,7 -9,7 +9,7 @@@ profile = profile.tize
  #passwd =
  obs = obs.tizen
  #Comma separated list of repositories
- repos = repo.public_latest, repo.devel-gcc49-base, 
+ repos = repo.public_latest, repo.devel-gcc49-base,
  #repos = repo.tizen_main, repo.tizen_base
  #Build config for gbs build
  #buildconf = <patch/to/build-config-file>