Merge branch 'master' into easysetup

Conflicts:
	service/easy-setup/enrollee/src/resourcehandler.cpp
	service/easy-setup/mediator/csdk/src/provisioning.cpp
	service/easy-setup/mediator/richsdk/android/EasySetupCore/build.gradle
	service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
	service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
	service/easy-setup/sdk/enrollee/src/easysetup.cpp

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

diff --cc build_common/SConscript
Simple merge

diff --cc service/SConscript
index dea7af0,363f26e..50fd899
mode 100755,100644..100755
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript

diff --cc service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp
Simple merge

diff --cc service/easy-setup/enrollee/src/resourcehandler.cpp
index 828e5cb,e556cfd..828e5cb
mode 100755,100644..100644
--- 1/service/easy-setup/enrollee/src/resourcehandler.cpp
--- 2/service/easy-setup/sdk/enrollee/src/resourceHandler.cpp
+++ b/service/easy-setup/enrollee/src/resourcehandler.cpp

diff --cc service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
index c249744,a39b98c..c249744
mode 100755,100644..100644
--- 1/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
--- 2/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle

diff --cc tools/tizen/iotivity.spec
index d3ef7d3,72b6eef..ecd2078
mode 100755,100644..100644
--- 1/tools/tizen/iotivity.spec
--- 2/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec