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

Conflicts:
	src/com/HCBrand/view/MainActivity.java