removed generateJson function
Merge branch 'master' of https://github.com/nicolas-fricke/roboticon