11
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024

Conflicts:
	Classes/UserDefault.h
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024

Conflicts:
	Classes/UserDefault.h
paihangbang
暂停页面 退出保留分数
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024