Merge branch 'master' into tizen_2.1

Conflicts:
	include/common/MsgInternalTypes.h
	mapi/msg_message.cpp
	mapi/msg_mms.cpp
	mapi/msg_transport.cpp
	msg-service.manifest
	packaging/msg-service.spec
	plugin/sms_plugin/SmsPluginTransport.cpp
	proxy/MsgHandleControl.cpp
	utils/MsgMmsMessage.cpp
	utils/MsgUtilStorage.cpp

Change-Id: Id47318cb4c35e60aa950e1e0c02e38f6e10d7034

diff --cc mapi/msg_message.cpp
index b78d7a3,b01381e..579dc8b
--- 1/mapi/msg_message.cpp
--- 2/mapi/msg_message.cpp
+++ b/mapi/msg_message.cpp
@@@ -50,7 -50,7 +50,8 @@@ void msg_message_create_struct(msg_stru
        msg->dataSize = 0;
        msg->pData = NULL;
        msg->pMmsData = NULL;
- 
+       msg->mmsDataSize = 0;
++      
        /* Allocate memory for address list of message */
        msg_struct_list_s *addr_list = (msg_struct_list_s *)new msg_struct_list_s;
  

diff --cc mapi/msg_mms.cpp
index c8b51fc,fe6352d..a6bbe1b
--- 1/mapi/msg_mms.cpp
--- 2/mapi/msg_mms.cpp
+++ b/mapi/msg_mms.cpp
@@@ -356,7 -356,7 +356,8 @@@ int msg_mms_get_int_value(msg_struct_s 
        break;
        case MSG_STRUCT_MMS_MEDIA:
        {
-               MMS_MEDIA_S *mms_media_data = (MMS_MEDIA_S *)msg_struct->data;
+               MMS_MEDIA_HIDDEN_S *mms_media_data = (MMS_MEDIA_HIDDEN_S *)msg_struct->data;
++              
                if (field == MSG_MMS_MEDIA_TYPE_INT)
                        *value = mms_media_data->mediatype;
                else if (field == MSG_MMS_MEDIA_DRM_TYPE_INT)

diff --cc proxy/MsgHandleControl.cpp
index 58c32d5,34d4808..e59f292
--- 1/proxy/MsgHandleControl.cpp
--- 2/proxy/MsgHandleControl.cpp
+++ b/proxy/MsgHandleControl.cpp
@@@ -338,7 -342,7 +342,6 @@@ void MsgHandle::convertMsgStruct(const 
  
                // Get Message Data from File
                if (pSrc->networkStatus != MSG_NETWORK_RETRIEVE_FAIL) {
-                       MSG_DEBUG("Get Message Data from file : size[%d] name[%s]\n", pDest->dataSize, pSrc->msgData);
 -
                        if (MsgOpenAndReadFile(pSrc->msgData, &pFileData, &fileSize) == false)
                                THROW(MsgException::FILE_ERROR, "MsgOpenAndReadFile error");