Merge branch 'master' into calendar

.htaccess

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/appinfo/database.xml

apps/bookmarks/bookmarksHelper.php

apps/bookmarks/css/bookmarks.css

apps/bookmarks/js/addBm.js

apps/bookmarks/js/bookmarks.js

apps/bookmarks/templates/addBm.php

apps/bookmarks/templates/list.php

apps/contacts/templates/index.php

apps/contacts/templates/part.details.php

apps/contacts/temporaryupdate.php

apps/files_sharing/ajax/getitem.php

apps/files_sharing/ajax/share.php

apps/files_sharing/appinfo/app.php