Merge branch 'master' into userinfo

Conflicts:
	images.qrc
	src/ui/userinfopanel.cpp

diff --cc images.qrc
index f05aa75,da50267..5d39858
--- 1/images.qrc
--- 2/images.qrc
+++ b/images.qrc
@@@ -24,9 -23,7 +23,9 @@@
          <file>res/images/list_item_bottom.png</file>
          <file>res/images/list_item_middle.png</file>
          <file>res/images/list_item_top.png</file>
-       <file>res/images/user_info_item_bottom.png</file>
++          <file>res/images/user_info_item_bottom.png</file>
 +        <file>res/images/user_info_item_middle.png</file>
 +        <file>res/images/user_info_item_top.png</file>
          <file>res/images/sliding_bar_left_test.png</file>
          <file>res/images/userpanel_mask.png</file>
          <file>res/images/sliding_bar_right_test.png</file>

diff --cc src/ui/userinfopanel.cpp
index 60b952d,7d76313..7a5bc54
--- 1/src/ui/userinfopanel.cpp
--- 2/src/ui/userinfopanel.cpp
+++ b/src/ui/userinfopanel.cpp
@@@ -64,10 -48,11 +64,18 @@@ void UserInfoPanel::userDataReceived(Us
  {
      qDebug() << __PRETTY_FUNCTION__;
  
 -    if(user) {
 -        m_userInfo->setUserName(user->name());
 -        m_userInfo->setAvatar(user->profileImage());
 -        m_userInfo->setMessageText(user->note());
 -        m_userInfo->setAddress(user->address());
 -        m_userInfo->setTime(user->timestamp());
 -    }
 +//    m_userInfo->setUserName(user->name());
-        m_userInfo->setUserName("pirkko-liisapaula Marjamaa-Pulkkinen");
++    m_userInfo->setUserName("pirkko-liisapaula Marjamaa-Pulkkinen");
 +    m_userInfo->setProfileImage(user->profileImage());
 +    m_userInfo->setMessageText(user->note());
 +    m_userInfo->setAddress(user->address());
 +    m_userInfo->setTime(user->timestamp());
++
++    //if(user) {
++    //    m_userInfo->setUserName(user->name());
++    //    m_userInfo->setAvatar(user->profileImage());
++    //    m_userInfo->setMessageText(user->note());
++    //    m_userInfo->setAddress(user->address());
++    //    m_userInfo->setTime(user->timestamp());
++    //}
  }