Commiting what was uncommited from last time
Commiting what was uncommited from last time
Modified json api to fix encoding errors
Fixing conflicts