Merge branch '1.1-rel'

Merge branch '1.1-rel'

Conflicts:
	android/examples/settings.gradle
	android/examples/simplebase/simplebase.iml
	android/examples/simplebase/src/main/AndroidManifest.xml
	android/examples/simplebase/src/main/res/values-w820dp/dimens.xml
	android/examples/simplebase/src/main/res/values/dimens.xml
	plugins/samples/linux/IotivityandZigbeeClient.c
	resource/csdk/connectivity/inc/cablockwisetransfer.h
	resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
	resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
	resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
	resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c
	resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
	resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
	resource/csdk/connectivity/src/cablockwisetransfer.c
	resource/csdk/connectivity/src/ip_adapter/caipserver.c
	resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
	resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
	resource/csdk/connectivity/util/src/camanager/tizen/caleconnectionmanager.c
	resource/csdk/security/SConscript
	resource/csdk/security/include/internal/aclresource.h
	resource/csdk/security/include/internal/dpairingresource.h
	resource/csdk/security/include/internal/pconfresource.h
	resource/csdk/security/include/internal/pstatresource.h
	resource/csdk/security/include/internal/srmresourcestrings.h
	resource/csdk/security/include/securevirtualresourcetypes.h
	resource/csdk/security/provisioning/ck_manager/sample/provisioningclient.c
	resource/csdk/security/provisioning/sample/SConscript
	resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
	resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
	resource/csdk/security/provisioning/src/credentialgenerator.c
	resource/csdk/security/provisioning/src/ownershiptransfermanager.c
	resource/csdk/security/provisioning/src/secureresourceprovider.c
	resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
	resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
	resource/csdk/security/src/aclresource.c
	resource/csdk/security/src/amaclresource.c
	resource/csdk/security/src/base64.c
	resource/csdk/security/src/credresource.c
	resource/csdk/security/src/directpairing.c
	resource/csdk/security/src/doxmresource.c
	resource/csdk/security/src/dpairingresource.c
	resource/csdk/security/src/pconfresource.c
	resource/csdk/security/src/psinterface.c
	resource/csdk/security/src/pstatresource.c
	resource/csdk/security/src/resourcemanager.c
	resource/csdk/security/src/secureresourcemanager.c
	resource/csdk/security/src/srmresourcestrings.c
	resource/csdk/security/src/svcresource.c
	resource/csdk/security/unittest/aclresourcetest.cpp
	resource/csdk/security/unittest/credentialresource.cpp
	resource/csdk/security/unittest/doxmresource.cpp
	resource/csdk/stack/include/octypes.h
	resource/csdk/stack/samples/linux/secure/SConscript
	resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp
	resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
	resource/csdk/stack/src/ocpayload.c
	resource/csdk/stack/src/ocpayloadparse.c
	resource/csdk/stack/src/ocresource.c
	resource/csdk/stack/src/ocstack.c
	resource/docs/cpp-doc/Doxyfile
	resource/docs/cpp-doc/devdox/mainpage.dox
	resource/provisioning/examples/SConscript
	resource/provisioning/examples/provisioningclient.cpp
	resource/unittests/OCPlatformTest.cpp
	service/easy-setup/enrollee/arduino/onboarding.cpp
	service/easy-setup/enrollee/inc/onboarding.h
	service/easy-setup/enrollee/src/easysetup.c
	service/easy-setup/enrollee/src/easysetupcallbacks.h
	service/easy-setup/enrollee/src/onboarding.h
	service/easy-setup/enrollee/src/resourcehandler.c
	service/easy-setup/enrollee/src/resourcehandler.h
	service/easy-setup/enrollee/src/softap.c
	service/easy-setup/enrollee/src/softap.h
	service/easy-setup/mediator/csdk/unittests/MediatorCSDKTest.cpp
	service/easy-setup/mediator/richsdk/unittests/MediatorRichTest.cpp
	service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c
	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
	service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
	service/resource-encapsulation/examples/tizen/RESampleClientApp/src/reclient.cpp
	service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java
	tools/tizen/iotivity.spec
	service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java

Change-Id: I912131cd6905e5758a143fa71d0e32ef4201abab
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Markus Jung <jay.sharma@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: Saurabh Sharma <saurabh.s9@samsung.com>
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>