improve comment
Merge remote-tracking branch 'upstream/develop' into develop
fixed zipcode problem and keyboard textbox cursor