Fix merge conflict from stash apply
Photo Upload widget is working and has cropping, needs a lot of styling love