Revert "修改649为640"

This reverts commit 4f5ad5bc4cee44acbfad43566b79b87ef850b62a.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/AppDelegate.cpp
Merge branch 'master' of https://github.com/EMGAME/Sister