bug fixed
Merge branch 'master' of github.com:chris6k/tiyuzazhi

Conflicts:
	res/layout/magazine_list_layout.xml