fixes for photo uploading when local development
Merge remote branch 'upstream/master'
public fixes
Merge remote branch 'upstream/master'
style changes
Merge remote branch 'upstream/master'
slugs
Merge remote branch 'upstream/master'
phil