Merge branch 'devel/home/master'

Conflicts:
	src/server.c

Ping timer is changed to 20 seconds. (for mobile)
Slave's priority will be lower than normal until it is used by user

Change-Id: I4e4e389bfe0f517ce1d19607e13156bce4176219

diff --cc data/x11.mobile.480x800.conf.ini
index 34671c0,f6e2b30..f2dbb4d
--- 1/data/x11.mobile.480x800.conf.ini
--- 2/data/x11.mobile.480x800.conf.ini
+++ b/data/x11.mobile.480x800.conf.ini
@@@ -41,3 -41,5 +41,5 @@@ use_gettimeofday=tru
  slave_event_boost_on=-10
  slave_event_boost_off=0
  event_filter=0.5
 -slave_limit_to_ttl=true
 -frame_skip=5
++#slave_limit_to_ttl=true
++#frame_skip=5

diff --cc src/slave_life.c
index f5b0047,515c62e..bfa6f9e
--- 1/src/slave_life.c
--- 2/src/slave_life.c
+++ b/src/slave_life.c
@@@ -48,9 -49,11 +49,12 @@@
  #include "abi.h"
  #include "xmonitor.h"
  
+ #include "package.h"
+ #include "instance.h"
+ 
  #define BUNDLE_SLAVE_SVC_OP_TYPE "__APP_SVC_OP_TYPE__"
  #define APP_CONTROL_OPERATION_MAIN "http://tizen.org/appcontrol/operation/main"
 +#define LOW_PRIORITY  10
  
  int errno;