Merge branch 'dev'
Fixed a problem of text input by the UITextField.
Merge branch 'master' into dev