Done button for picker view
.
Merge remote-tracking branch 'origin/master'