changed input field values
Merge branch 'dev' into servlet2