xiugai
修改
Merge branch 'master' of https://github.com/golfdev/Gf-core.git

Conflicts:
	src/com/jinfang/golf/search/home/GolfSearchHome.java