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

apps/calendar/ajax/categories/rescan.php

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

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

apps/calendar/index.php

apps/calendar/lib/app.php

apps/calendar/lib/calendar.php

apps/calendar/lib/object.php

apps/calendar/templates/part.eventform.php

apps/contacts/index.php

apps/contacts/lib/app.php

apps/files_external/tests/config.php

apps/files_external/tests/ftp.php

apps/files_external/tests/google.php

apps/files_external/tests/webdav.php

apps/media/appinfo/database.xml

apps/media/appinfo/info.xml

core/css/oc-vcategories.css

core/css/styles.css

core/js/js.js

core/js/oc-vcategories.js