Lots of more JSON rendering stuff
Merge branch 'develop' into bug/json_render02
Merge pull request #152 from telefonicaid/bug/json_render02

Bug/json render02