temp commit
Merge branch 'master' of https://github.com/lygn128/----Iphone_2_1_9
Merge branch 'master' of https://github.com/lygn128/----Iphone_2_1_9
Merge branch 'master' of https://github.com/lygn128/----Iphone_2_1_9

Conflicts:
	MyPageViewController.m
首次进入界面排列不正确
优化滑动