-fixed a bug where photos on photos tab would lose their layout
Merge remote-tracking branch 'upstream/master'