initial merge of ecodata and field data

initial merge of ecodata and field data
fixes for rendering JSON