Apply custom URL for "your photos" page to HTML mockups master.
Merge branch 'master' into tumblr

Conflicts:
	web/index.html