(with Jason Whitehouse) Fixed issue when clicking save while a cell in the table was still being edited
Fixed merge conflicts