add test.c just use to see how 'git merge' works
Merge branch 'test' into develop
Merge branch 'master' into develop
clean
resolve the problem: using gson, generics func throws java.lang.ClassCastException: com.google.gson.internal.LinkedTreeMap...