added text fields and method to end editing on view tap
Merge branch 'add_textFields' into develop