ipad 适配
Merge branch 'master' of https://github.com/edwardair/newProject

Conflicts:
	WuXiChina_AppStore/WUXIAPP__ 2/wuxigovapp.xcodeproj/project.pbxproj