json object process
Merge pull request #1 from usstwxy/data

json object process
Merge branch 'ui-lhc' into develop

Conflicts:
	src/com/smallcat/data/JsonObj.java
Merge remote-tracking branch 'origin/develop' into ui-lhc
some small things