Merge "Update some items" into tizen

diff --cc notification-ex/item_factory.cc
index 721c4b8eb60d2c56755ec6dfc890eb65c9a37957,b3a90b155c6d298420f61a1d70ad37e668ecef74..0850145fd1d1bf3952537260d0247a7a522f1f7b
--- 1/notification-ex/item_factory.cc
--- 2/notification-ex/item_factory.cc
+++ b/notification-ex/item_factory.cc
@@@ -43,11 -49,11 +49,11 @@@ shared_ptr<AbstractItem> ItemFactory::C
    case AbstractItem::NullObject :
      THROW(NOTIFICATION_ERROR_INVALID_PARAMETER);
    case AbstractItem::Text :
 -    return make_shared<TextItem>("");
 +    return make_shared<TextItem>("","");
    case AbstractItem::Icon :
-     return make_shared<ButtonItem>("");
+     return make_shared<IconItem>("");
    case AbstractItem::Image :
-     return make_shared<ButtonItem>("");
+     return make_shared<ImageItem>("");
    case AbstractItem::Button :
      return make_shared<ButtonItem>("");
    case AbstractItem::ChatMessage :