change tabs to 2; added json plugin
merging; change tabs to 2; added json plugin