changed serialized strings to json.
Merge branch 'master' into production