add
Merge branch 'master' of https://github.com/weaiken/HCBrand
add
Merge branch 'master' of https://github.com/weaiken/HCBrand

Conflicts:
	src/com/HCBrand/config/URLConfig.java
	src/com/HCBrand/view/base/CustomListView.java
add
Merge branch 'master' of https://github.com/weaiken/HCBrand

Conflicts:
	src/com/HCBrand/config/URLConfig.java