Add cell for editing with textfield
Merge from master