Merge branch 'master' of gitorious.org:owncloud/owncloud

3rdparty/css/chosen.css

apps/admin_export/templates/settings.php

apps/bookmarks/templates/addBm.php

apps/calendar/ajax/editcalendar.php

apps/calendar/ajax/getcal.php

apps/calendar/ajax/importdialog.php

apps/calendar/appinfo/app.php

apps/calendar/css/style.css

apps/calendar/import.php

apps/calendar/js/calendar.js

apps/calendar/js/loader.js

apps/calendar/js/settings.js

apps/calendar/templates/part.editcalendar.php

apps/calendar/templates/part.eventform.php

apps/calendar/templates/part.eventinfo.php

apps/calendar/templates/part.import.php

apps/calendar/templates/settings.php

apps/contacts/ajax/addproperty.php

apps/contacts/js/interface.js

apps/contacts/lib/vcard.php