photoviewco,launch came,addEdit
Merge remote-tracking branch 'origin/master'