发撒的发
Merge branch 'master' of https://github.com/GHunique/CrazyGeography1

Conflicts:
	Classes/CGConfig/GlobalUserDefault.mm