add a featureflag for photos
Merge branch 'master' into deployed-2014