Signed-off-by: jerry <jerry_tsx@163.com>
Merge branch 'master' of https://github.com/tanshuangxi/Appfuse.git

Conflicts:
	src/com/tan/Test.java