更改一些bug
Merge remote-tracking branch 'upstream/master'

Conflicts:
	iosapp.xcodeproj/project.pbxproj
Could dance with bugs now.