Merge branch 'master' into updates
update core
Merge branch 'updates'
Merge branch 'image-quality'
Merge branch 'photo_album'
adjust album colorbox script
Merge branch 'master' into photo_album