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

Conflicts:
	res/layout/activity_main.xml
add