Merge remote branch 'upstream/master'

Conflicts:
	view/theme/vier/style.css

diff --cc view/theme/vier/style.css
index a9ff22f78dfe90899a13803822686d1d30acb8ba,96233c1daa6a81a5ddd7893cb4b8d6a8420151a5..d4084c05d66807e681e3ee8215d05686b8407ced
--- 1/view/theme/vier/style.css
--- 2/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@@ -200,9 -200,9 +200,15 @@@
  .icon.s16.delete {
    background-image: url("../../../images/icons/16/delete.png");
  }
++<<<<<<< HEAD
 +/*.icon.s16.edit {
 +  background-image: url("../../../images/icons/16/edit.png");
 +}*/
++=======
+ .icon.s16.edit {
+   background-image: url("../../../images/icons/16/edit.png");
+ }
++>>>>>>> upstream/master
  .icon.s16.star {
    background-image: url("../../../images/icons/16/star.png");
  }
@@@ -913,7 -913,7 +919,11 @@@ section 
  }
  .wall-item-container .wall-item-actions-tools {
    float: right;
++<<<<<<< HEAD
 +  width: 80px;
++=======
+   width: 60px;
++>>>>>>> upstream/master
  }
  .wall-item-container .wall-item-actions-tools a {
    float: right;
@@@ -1028,13 -1028,7 +1038,17 @@@
  /* contacts menu */
  .contact-photo-wrapper {
    position: relative;
++<<<<<<< HEAD
 +  width: 80px;
 +}
 +
 +.contact-photo-wrapper.wwto {
 +  width: 25px;
  }
 +
++=======
++}
++>>>>>>> upstream/master
  .contact-photo {
    width: 48px;
    height: 48px;
@@@ -1396,34 -1390,9 +1410,40 @@@ ul.tabs li .active 
  .field.radio .field_help {
    margin-left: 0px;
  }
++<<<<<<< HEAD
 +
 +#profile-edit-links-end {
 +        clear: both;
 +        margin-bottom: 15px;
 +}
 +
 +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
 +
  #profile-edit-links li {
 +  float: left;
    list-style: none;
 +  margin-left: 10px;
 +}
 +
 +.profile-edit-side-div {
 +  display: none;
 +}
 +
 +#register-form label,
 +#profile-edit-form label {
 +        width: 300px; float: left;
  }
 +
 +.required {
 +  display: inline;
 +  color: #B20202;
 +}
 +
++=======
++#profile-edit-links li {
++  list-style: none;
++}
++>>>>>>> upstream/master
  /* oauth */
  .oauthapp {
    height: auto;
@@@ -1480,38 -1449,3 +1500,41 @@@ footer 
    height: 100px;
    display: table-row;
  }
++<<<<<<< HEAD
 +
 +blockquote {
 +    border-left: 1px solid #D2D2D2;
 +    padding-left: 9px;
 +    margin: 0 0 0 .8ex;
 +}
 +
 +/* ================== */
 +/* = Contacts Block = */
 +/* ================== */
 +
 +.contact-block-img {
 +        width: 42px;
 +        height: 42px;
 +        padding-right: 2px;
 +}
 +.contact-block-div {
 +        float: left;
 +}
 +
 +.contact-block-textdiv { width: 150px; height: 34px; float: left; }
 +#contact-block-end { clear: both; } 
 +
 +#group-edit-wrapper {
 +        margin-bottom: 10px;
 +}
 +
 +#group-members-end {
 +        clear: both;
 +}
 +
 +/*
 +#group-separator,
 +#prof-separator { display: none;}
 +*/
++=======
++>>>>>>> upstream/master