last commit before GKImagePicker integration