content_proxy now parses source into JSON-data.
fixed diff
Merge branch 'livarb-master'

Better handling of xml to json feed