Merge branch 'master' into filesystem

README

apps/bookmarks/js/bookmarks.js

apps/calendar/ajax/createcalendar.php

apps/calendar/ajax/events.php

apps/calendar/ajax/updatecalendar.php

apps/calendar/js/calendar.js

apps/calendar/templates/part.eventform.php

apps/calendar/templates/settings.php

apps/contacts/ajax/addcard.php

apps/contacts/ajax/addproperty.php

apps/contacts/ajax/createaddressbook.php

apps/contacts/ajax/setproperty.php

apps/contacts/templates/part.chooseaddressbook.rowfields.php

apps/contacts/templates/part.editaddressbook.php

apps/contacts/templates/part.property.FN.php

apps/contacts/templates/part.property.php

apps/contacts/templates/part.setpropertyform.php

apps/gallery/ajax/galleryOp.php

apps/gallery/css/styles.css

apps/gallery/js/album_cover.js