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

apps/calendar/templates/settings.php

apps/contacts/ajax/addproperty.php

apps/contacts/js/interface.js

apps/contacts/lib/vcard.php

apps/contacts/templates/part.addcardform.php

apps/gallery/ajax/cover.php

apps/gallery/ajax/getAlbums.php

apps/gallery/ajax/getCovers.php

apps/gallery/appinfo/info.xml

apps/gallery/lib_scanner.php

apps/media/css/music.css

apps/remoteStorage/lib_remoteStorage.php

core/css/styles.css

core/js/js.js

core/templates/login.php

index.php

lib/helper.php

lib/util.php

settings/css/settings.css