Changes to slider activity behavior, user can set image for a track
Merge remote-tracking branch 'origin/master'