album categories possibility deleted 2 edition
Merge remote-tracking branch 'origin/master'