1
Android
Merge branch 'master' of https://github.com/sudk/golf

Conflicts:
	技术文档/移动端接口文档1.0.xls