半成品
Merge remote-tracking branch 'origin/半成品'

Conflicts:
	src/com/comicon/pamphlet/ui/main/HomeActivity.java