Merge local branch into tizen

Merge local branch into tizen

Conflicts:
	CMakeLists.txt
	client/CMakeLists.txt
	client/ClientChannel.cpp
	client/ClientDispatcher.cpp
	client/ClientIPC.cpp
	client/Reader.cpp
	client/SEService.cpp
	client/Session.cpp
	client/include/ClientChannel.h
	client/include/ClientDispatcher.h
	client/include/ClientIPC.h
	client/include/Reader.h
	client/include/SEService.h
	client/include/Session.h
	common/APDUHelper.cpp
	common/AccessCondition.cpp
	common/AccessControlList.cpp
	common/ByteArray.cpp
	common/CMakeLists.txt
	common/DispatcherHelper.cpp
	common/EFDIR.cpp
	common/FCI.cpp
	common/FileObject.cpp
	common/IPCHelper.cpp
	common/ISO7816BERTLV.cpp
	common/Message.cpp
	common/NumberStream.cpp
	common/OpensslHelper.cpp
	common/PKCS15.cpp
	common/PKCS15DODF.cpp
	common/PKCS15ODF.cpp
	common/PKCS15OID.cpp
	common/PKCS15Object.cpp
	common/PKCS15Path.cpp
	common/PKCS15TokenInfo.cpp
	common/SignatureHelper.cpp
	common/SimpleTLV.cpp
	common/TLVHelper.cpp
	common/include/APDUHelper.h
	common/include/AccessCondition.h
	common/include/AccessControlList.h
	common/include/ByteArray.h
	common/include/Channel.h
	common/include/Debug.h
	common/include/DispatcherHelper.h
	common/include/DispatcherMsg.h
	common/include/EFDIR.h
	common/include/Exception.h
	common/include/FCI.h
	common/include/FileObject.h
	common/include/IPCHelper.h
	common/include/ISO7816BERTLV.h
	common/include/Message.h
	common/include/NumberStream.h
	common/include/OpensslHelper.h
	common/include/PKCS15.h
	common/include/PKCS15DODF.h
	common/include/PKCS15ODF.h
	common/include/PKCS15OID.h
	common/include/PKCS15Object.h
	common/include/PKCS15Path.h
	common/include/PKCS15TokenInfo.h
	common/include/ProviderHelper.h
	common/include/ReaderHelper.h
	common/include/Record.h
	common/include/SEServiceHelper.h
	common/include/Serializable.h
	common/include/SessionHelper.h
	common/include/SignatureHelper.h
	common/include/SimpleTLV.h
	common/include/TLVHelper.h
	common/include/Terminal.h
	packaging/smartcard-service.spec
	server/CMakeLists.txt
	server/ClientInstance.cpp
	server/ServerChannel.cpp
	server/ServerDispatcher.cpp
	server/ServerIPC.cpp
	server/ServerReader.cpp
	server/ServerResource.cpp
	server/ServerSEService.cpp
	server/ServerSession.cpp
	server/ServiceInstance.cpp
	server/include/ClientInstance.h
	server/include/ServerChannel.h
	server/include/ServerDispatcher.h
	server/include/ServerIPC.h
	server/include/ServerReader.h
	server/include/ServerResource.h
	server/include/ServerSEService.h
	server/include/ServerSession.h
	server/include/ServiceInstance.h
	server/org.tizen.smartcard_service.service
	server/smartcard-daemon.cpp
	test-client/CMakeLists.txt
	test-client/test-client-sync.cpp
	test-client/test-client.cpp

Change-Id: Id1dee9e43f2d75752a75dccae9e7e3a8c70b5775