冲突解决
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY

Conflicts:
	QXH/AddressListModule/Controller/AddressListViewController.m
	QXH/HomePageModule/Controller/MyTribeDetailViewController.m