页面布局适配
Merge branch 'master' of https://github.com/xieyajie/DoodleTee

Conflicts:
	DoodleTee.xcodeproj/project.pbxproj