config files
fixes photo bug
photo bug all fixed
merge conflicts