Merge branch 'master' of git://anongit.kde.org/owncloud

apps/bookmarks/ajax/delBookmark.php

apps/contacts/templates/part.details.php

apps/files_sharing/get.php

apps/files_sharing/js/share.js

apps/media/l10n/ca.php

apps/media/l10n/da.php

apps/media/l10n/de.php

apps/media/l10n/el.php

apps/media/l10n/es.php

apps/media/l10n/fr.php

apps/media/l10n/id.php

apps/media/l10n/nl.php

apps/media/l10n/pl.php

apps/media/l10n/pt_BR.php

apps/media/l10n/sv.php

apps/media/templates/music.php

core/css/styles.css

core/l10n/fr.php

core/l10n/id.php

core/l10n/pl.php