Added album functionality
Merge https://github.com/ozonesurfer/beegoapp2