fixed a bug where sometimes photos tab showed duplicates
Merge remote-tracking branch 'origin/development' into development