fix typo
Merge branch 'master' of github.com:DataGarage/json-table
edit interface
conflict fix