修改url
Merge branch 'master' of https://github.com/golfdev/Gftest.git

Conflicts:
	src/com/jinfang/golf/controllers/v1/chat/ChatController.java