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

.gitignore

apps/calendar/ajax/getcal.php

apps/calendar/css/style.css

apps/calendar/templates/settings.php

apps/files_sharing/get.php

apps/gallery/ajax/cover.php

apps/gallery/ajax/createAlbum.php

apps/gallery/ajax/getAlbums.php

apps/gallery/ajax/getCovers.php

apps/gallery/ajax/scanForAlbums.php

apps/gallery/ajax/thumbnail.php

apps/gallery/appinfo/info.xml

apps/gallery/index.php

apps/gallery/lib_scanner.php

apps/media/css/music.css

apps/remoteStorage/lib_remoteStorage.php

core/css/styles.css

core/img/actions/selected.png

core/img/actions/selected.svg

files/css/files.css