Added javascript and json formatting
Merged master