Worked on displaying images when entering a certain album.
Merge remote-tracking branch 'origin/master'