changed placeholder image
fixed keyboard bug
Merge remote-tracking branch 'origin'