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

apps/bookmarks/addBm.php

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/delBookmark.php

apps/bookmarks/ajax/getMeta.php

apps/bookmarks/ajax/recordClick.php

apps/bookmarks/ajax/updateList.php

apps/bookmarks/bookmarksHelper.php

apps/bookmarks/css/bookmarks.css

apps/bookmarks/js/bookmarks.js

apps/bookmarks/templates/list.php