Cherry-picked two commits from Pull Request #8

I merged the two commits from the original pull request into this branch and changed the default action of albums to BROWSE (as suggested by Kurt) and of songs to ADD.