Merge branch 'master' into sharing

.htaccess

admin/templates/users.php

apps/media/css/music.css

apps/media/css/player.css

apps/media/js/collection.js

apps/media/js/player.js

core/css/jquery-tipsy.css

core/img/actions/pause-big.png

core/img/actions/pause-big.svg

core/img/actions/pause.png

core/img/actions/pause.svg

core/img/actions/play-big.png

core/img/actions/play-big.svg

core/img/actions/play-next.png

core/img/actions/play-next.svg

core/img/actions/play-previous.png

core/img/actions/play-previous.svg

core/img/actions/sound-off.png

core/img/actions/sound-off.svg

core/img/actions/sound.png