allowEdit from Gallery done
cropping from camera done
resolved merge conflict