Merge gitorious.org:owncloud/owncloud into vcategories

apps/calendar/lib/object.php

apps/contacts/ajax/addcard.php

apps/contacts/ajax/addcontact.php

apps/contacts/ajax/addproperty.php

apps/contacts/ajax/deleteproperty.php

apps/contacts/ajax/savecrop.php

apps/contacts/ajax/saveproperty.php

apps/contacts/ajax/setproperty.php

apps/contacts/import.php

apps/contacts/js/contacts.js

apps/contacts/lib/app.php

apps/contacts/lib/vcard.php

apps/contacts/templates/part.contactphoto.php

core/css/styles.css

files/ajax/newfile.php

files/ajax/newfolder.php

files/js/files.js

files/templates/index.php