Merge pull request #130 from owncloud/issue/127

Use display name instead of user ID in activity emails
Merge pull request #129 from owncloud/issue/125

Issue/125 Don’t show tipsy path tooltip for files in root
Merge branch 'master' into backport-master-7.0.1

* master: