Photo view
Merge remote-tracking branch 'origin/sonali' into shan