Merge remote-tracking branch 'tizen_2.2' into tizen

Merge remote-tracking branch 'tizen_2.2' into tizen

Conflicts:
	TC/testcase/utc_net_nfc_client_ndef_message.c
	daemon/net_nfc_server_util.c
	nfc-manager.manifest
	packaging/nfc-manager.spec
	src/clientlib/CMakeLists.txt
	src/clientlib/include/net_nfc_internal_se.h
	src/clientlib/include/net_nfc_ndef_message.h
	src/clientlib/net_nfc_client_dispatcher.c
	src/clientlib/net_nfc_client_internal_se.c
	src/clientlib/net_nfc_client_ipc.c
	src/clientlib/net_nfc_client_ndef_message.c
	src/clientlib/net_nfc_client_ndef_record.c
	src/clientlib/net_nfc_client_tag.c
	src/commonlib/CMakeLists.txt
	src/commonlib/include/net_nfc_typedef.h
	src/commonlib/include/net_nfc_typedef_private.h
	src/commonlib/include/net_nfc_util_private.h
	src/commonlib/net_nfc_util.c
	src/manager/CMakeLists.txt
	src/manager/include/net_nfc_app_util_private.h
	src/manager/include/net_nfc_service_se_private.h
	src/manager/net_nfc_server_context.c
	src/manager/net_nfc_server_dispatcher.c
	src/manager/net_nfc_server_ipc.c
	src/manager/net_nfc_service.c
	src/manager/net_nfc_service_se.c