Merge branch tizen_2.4 into tizen_3.0

Change-Id: I602e472c8d9a054e1e6b06a6987152480e95a02a

diff --cc packaging/webapi-plugins.spec
index af67bb3,e683a91..3539711
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -235,9 -233,9 +237,9 @@@ Source0:    %{name}-%{version}.tar.g
  %define tizen_feature_alarm_support               1
  %define tizen_feature_application_support         1
  %define tizen_feature_archive_support             1
- %define tizen_feature_badge_support               1
+ %define tizen_feature_badge_support               0
 -%define tizen_feature_bluetooth_support           0
 -%define tizen_feature_bookmark_support            0
 +%define tizen_feature_bluetooth_support           1
 +%define tizen_feature_bookmark_support            1
  %define tizen_feature_calendar_support            0
  %define tizen_feature_callhistory_support         0
  %define tizen_feature_contact_support             0

diff --cc src/application/application_manager.cc
Simple merge

diff --cc src/bluetooth/bluetooth_gatt_service.cc
Simple merge

diff --cc src/common/callback_user_data.cc
Simple merge

diff --cc src/common/extension.cc
Simple merge

diff --cc src/datacontrol/datacontrol_instance.cc
Simple merge

diff --cc src/download/download_instance.cc
Simple merge

diff --cc src/sound/sound_manager.cc
Simple merge