Merge branch 'master' of github.com:owncloud/core into issue_1776

Conflicts:
	core/templates/layout.user.php

diff --cc core/templates/layout.user.php
index 03e55594d676416954657e5c0c9ef34ca35f102b,3bc1903876e4bb46c858b0f4eebe9b6fed499717..7a677b88345cdded293298f6705879d46769ecec
--- 1/core/templates/layout.user.php
--- 2/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@@ -34,7 -34,7 +34,7 @@@
  
                        <ul id="settings" class="svg">
                                <span id="expand">
-                                       <span id="expandDisplayName"><?php echo $_['displayname'] ?></span>
 -                                      <?php echo $_['user_displayname'] ?>
++                                      <span id="expandDisplayName"><?php echo $_['user_displayname'] ?></span>
                                        <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
                                </span>
                                <div id="expanddiv">

diff --cc settings/js/personal.js
index 4c8b2542b561c18a9994bd8811cb79513942748f,d9455b3786bbdd881badd180919ffb61145a6bca..d0a471e56b57b5cf8ff0cb35ad6da349804e761b
--- 1/settings/js/personal.js
--- 2/settings/js/personal.js
+++ b/settings/js/personal.js
@@@ -42,9 -42,6 +42,9 @@@ $(document).ready(function()
                        $.post( 'ajax/changedisplayname.php', post, function(data){
                                if( data.status == "success" ){
                                        $('#displaynamechanged').show();
-                                       $('#oldDisplayName').val($('#displayName').val());
++                                      $('#oldDisplayName').text($('#displayName').val());
 +                                      // update displayName on the top right expand button
-                                       $('#expandDisplayName').html($('#displayName').val());
++                                      $('#expandDisplayName').text($('#displayName').val());
                                }
                                else{
                                        $('#newdisplayname').val(data.data.displayName)