Merge branch 'master' into photo_album
style referenced photo album
update album feature
Merge branch 'updates'
Merge branch 'photo_album'
Merge branch 'master' into updates