Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/filesystem/filesystem_instance.cc
	src/filesystem/js/file.js

Change-Id: I355ce9bb6d27d1990267994f0cfec5c7eaa07792

diff --cc packaging/webapi-plugins.spec
index 77d8911d897eb12926e5097c0aefd90dcf923c11,4cc0921709363690c450cde97285d7ca6c3400f8..4965cba68361b949d9717af854762a51ba48eaca
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -10,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
--Version:    2.13
++Version:    2.14
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

diff --cc src/alarm/alarm_instance.cc
index 504149cd3f89ed133734951c1965b9f97845b431,1be9f9b159dd624f8a90fcf623bbf36d43f8e82c..ad0f4afcd3cbf53c37748ac51993679ff06893d3
--- 1/src/alarm/alarm_instance.cc
--- 2/src/alarm/alarm_instance.cc
+++ b/src/alarm/alarm_instance.cc
@@@ -40,14 -40,6 +40,14 @@@ AlarmInstance::AlarmInstance() 
    // AlarmAbsolute
    RegisterSyncHandler("AlarmAbsolute_getNextScheduledDate",
                        std::bind(&AlarmManager::GetNextScheduledDate, &manager_, _1, _2));
-   // Block of code related to Notification
 +
++// Block of code related to Notification
 +#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
 +  RegisterSyncHandler("AlarmManager_addAlarmNotification",
 +                      std::bind(&AlarmManager::AddAlarmNotification, &manager_, _1, _2));
 +  RegisterSyncHandler("AlarmManager_getAlarmNotification",
 +                      std::bind(&AlarmManager::GetAlarmNotification, &manager_, _1, _2));
 +#endif
  }
  
  AlarmInstance::~AlarmInstance() {

diff --cc src/nfc/nfc_api.js
Simple merge