fixed picker view with empty field
ambiguous pop up fixed
Merge remote-tracking branch 'origin/master'