1.修复附近崩溃.
2.增加兑换码(未开放)
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	AndroidManifest.xml