Added Polymock.generate_from_json()
Merge branch 'parser'