ensure gson to string is tidy
list and map utils
Merge origin/master Conflicts to workaround Gson escaping