fix bugs
Merge branch 'master' of https://github.com/lei-april/xiaoyudi_iOS

Conflicts:
	iosapp.xcodeproj/project.pbxproj
	iosapp.xcodeproj/project.xcworkspace/xcuserdata/lei.xcuserdatad/UserInterfaceState.xcuserstate