Merge branch 'master' into encryption

apps/bookmarks/addBm.php

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/getMeta.php

apps/bookmarks/appinfo/app.php

apps/bookmarks/appinfo/database.xml

apps/bookmarks/appinfo/info.xml

apps/bookmarks/bookmarksHelper.php

apps/bookmarks/css/bookmarks.css

apps/bookmarks/js/addBm.js

apps/bookmarks/js/bookmarks.js

apps/bookmarks/settings.php

apps/bookmarks/templates/addBm.php

apps/bookmarks/templates/bookmarklet.php

apps/bookmarks/templates/list.php

apps/bookmarks/templates/settings.php

apps/calendar/ajax/calendar/activation.php

apps/calendar/ajax/calendar/delete.php

apps/calendar/ajax/calendar/edit.form.php

apps/calendar/ajax/calendar/edit.php

apps/calendar/ajax/calendar/new.form.php