merge
Merge https://github.com/f1ne/hit_basketball_web

Conflicts:
	WebRoot/WEB-INF/classes/.gitignore
pull
Add some function:ranking &&search 2014/11/22 By Ye Zhe
Merge github.com:f1ne/hit_basketball_web

Conflicts:
	WebRoot/WEB-INF/classes/Player/PlayerAction.class
Merge pull request #5 from yezhejack/master

功能增加