Merge branch 'master' into easysetup

Resolved following in merge from master

Conflicts:
	service/SConscript
	service/easy-setup/SConscript
	service/easy-setup/sampleapp/enrollee/arduino/SConscript
	service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
	service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/AndroidManifest.xml
	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
	service/easy-setup/sampleapp/mediator/linux/SConscript
	service/easy-setup/sampleapp/mediator/linux/mediator.cpp
	service/easy-setup/sdk/common/common.h
	service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
	service/easy-setup/sdk/enrollee/common/inc/easysetup.h
	service/easy-setup/sdk/enrollee/common/inc/resourceHandler.h
	service/easy-setup/sdk/enrollee/common/src/easysetup.cpp
	service/easy-setup/sdk/enrollee/common/src/resourceHandler.cpp
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IpOnBoardingConnection.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceFactory.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiOnBoardingConfig.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
	service/easy-setup/sdk/mediator/inc/prov_adapter.h
	service/easy-setup/sdk/mediator/inc/provisioning.h
	service/easy-setup/sdk/mediator/src/prov_adapter.cpp
	service/easy-setup/sdk/mediator/src/provisioning.cpp
	service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp

Change-Id: I197e10e466ca08299dbcc58d78c72fb0b6d59e15
Signed-off-by: lankamadan <lanka.madan@samsung.com>

diff --cc service/SConscript
index 79ab632,3a35a4a..3a35a4a
mode 100644,100644..100755
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript

diff --cc service/easy-setup/SConscript
index fef6e1d,4b4446a..4b4446a
mode 100644,100644..100755
--- 1/service/easy-setup/SConscript
--- 2/service/easy-setup/SConscript
+++ b/service/easy-setup/SConscript

diff --cc service/easy-setup/sampleapp/enrollee/arduino/SConscript
index f9c5bf0,2fa74cd..2fa74cd
mode 100644,100644..100755
--- 1/service/easy-setup/sampleapp/enrollee/arduino/SConscript
--- 2/service/easy-setup/sampleapp/enrollee/arduino/SConscript
+++ b/service/easy-setup/sampleapp/enrollee/arduino/SConscript

diff --cc service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
index aa3416c,dd3c58c..dd3c58c
mode 100755,100644..100755
--- 1/service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
--- 2/service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
+++ b/service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp

diff --cc service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
index 97c527e,97c527e..97c527e
mode 100644,100644..100755
--- 1/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
--- 2/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml

diff --cc service/easy-setup/sampleapp/mediator/linux/SConscript
index 10d9873,8522aaa..8522aaa
mode 100644,100644..100755
--- 1/service/easy-setup/sampleapp/mediator/linux/SConscript
--- 2/service/easy-setup/sampleapp/mediator/linux/SConscript
+++ b/service/easy-setup/sampleapp/mediator/linux/SConscript

diff --cc service/easy-setup/sampleapp/mediator/linux/mediator.cpp
index 463a435,50e7cb7..50e7cb7
mode 100644,100644..100755
--- 1/service/easy-setup/sampleapp/mediator/linux/mediator.cpp
--- 2/service/easy-setup/sampleapp/mediator/linux/mediator.cpp
+++ b/service/easy-setup/sampleapp/mediator/linux/mediator.cpp

diff --cc service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
index b648a82,d4b3327..d4b3327
mode 100755,100644..100755
--- 1/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
--- 2/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
+++ b/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp

diff --cc service/easy-setup/sdk/mediator/inc/prov_adapter.h
index 3ceb901,fdd611f..fdd611f
mode 100644,100644..100755
--- 1/service/easy-setup/sdk/mediator/inc/prov_adapter.h
--- 2/service/easy-setup/sdk/mediator/inc/prov_adapter.h
+++ b/service/easy-setup/sdk/mediator/inc/prov_adapter.h

diff --cc service/easy-setup/sdk/mediator/inc/provisioning.h
index 5f63242,058d975..058d975
mode 100644,100644..100755
--- 1/service/easy-setup/sdk/mediator/inc/provisioning.h
--- 2/service/easy-setup/sdk/mediator/inc/provisioning.h
+++ b/service/easy-setup/sdk/mediator/inc/provisioning.h

diff --cc service/easy-setup/sdk/mediator/src/prov_adapter.cpp
index 343b9c0,98fe0fc..98fe0fc
mode 100755,100644..100755
--- 1/service/easy-setup/sdk/mediator/src/prov_adapter.cpp
--- 2/service/easy-setup/sdk/mediator/src/prov_adapter.cpp
+++ b/service/easy-setup/sdk/mediator/src/prov_adapter.cpp

diff --cc service/easy-setup/sdk/mediator/src/provisioning.cpp
index cf0d8a2,26fb88e..26fb88e
mode 100644,100644..100755
--- 1/service/easy-setup/sdk/mediator/src/provisioning.cpp
--- 2/service/easy-setup/sdk/mediator/src/provisioning.cpp
+++ b/service/easy-setup/sdk/mediator/src/provisioning.cpp

diff --cc service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
index b7afd28,aa8f161..aa8f161
mode 100755,100644..100755
--- 1/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
--- 2/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
+++ b/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp