photo picker on iPad
fix iPhone code
more object checking
merge