picker view bug for iPad and error message in delegate
Merge remote-tracking branch 'upstream/master'
fix error with wrong UIAlert options after cancel capture