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

apps/calendar/templates/part.import.php

apps/remoteStorage/appinfo/app.php

apps/remoteStorage/appinfo/database.xml

apps/remoteStorage/appinfo/info.xml

apps/remoteStorage/compat.php

apps/remoteStorage/lib_remoteStorage.php

apps/remoteStorage/oauth_ro_auth.php

apps/user_webfinger/activate.php

apps/user_webfinger/appinfo/info.xml

apps/user_webfinger/webfinger.php