commit
Merge branch 'master' of git@github.com:daishuguang/aihunqin.git

Conflicts:
	Aihunqin/res/layout/fragment_more.xml