Changed it so that there are now two separate context menu's, one for the
library view and one for the album view.
Merge branch 'master' of https://github.com/bsanders/softeng