Merge branch 'master' into sharing

.gitignore

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/delBookmark.php

apps/bookmarks/ajax/recordClick.php

apps/bookmarks/ajax/updateList.php

apps/bookmarks/appinfo/app.php

apps/bookmarks/appinfo/database.xml

apps/bookmarks/appinfo/info.xml

apps/bookmarks/css/bookmarks.css

apps/bookmarks/img/bookmarks.png

apps/bookmarks/index.php

apps/bookmarks/js/bookmarks.js

apps/bookmarks/templates/list.php

apps/contacts/css/styles.css

apps/contacts/js/interface.js

apps/contacts/lib/addressbook.php

apps/contacts/templates/part.details.php

apps/contacts/templates/part.property.php

config/.gitignore

core/ajax/grouplist.php