app
Merge branch 'fixBug' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	config.py
	test/testTimeout.py
fix config
Merge branch 'sortedScore' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	config.py
testUser
Merge branch 'sortedScore' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	test/testUser.py
Merge branch 'sortedScore' of http://github.com/liyonghelpme/nozomiServer into mlhr
before merge cn server code
Merge branch 'sortedScore' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	config.py
	test/testTimeout.py
english server
chat server
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn

Conflicts:
	config.py
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn
english not print testTimeOut
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn

Conflicts:
	config.py
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn

Conflicts:
	config.py
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn
config of english
use redis do rank
test performance

Conflicts:

	module/UserRankModule.py
test performance of rank code
improve getRange by query a bulk IDS