Moving json generation to server side
Merge pull request #1 from xcthulhu/master

Moving json generation to server side