man
Merge branch 'master' of github.com:man-man/man

Conflicts:
	src/com/app/common/HttpRequestUtils.java
鹏哥修改（处理Image loader）