Std Photos
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/frame15/web/5.75x4.25d.png
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 8837c8c4793ca633e6820589608a769d092f664c.