Albums to songs mapping working
Merge conflicts fixed in Song and App