test performance
nginx interface confi
commit before update
app
Merge branch 'fixBug' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	config.py
	test/testTimeout.py
Merge branch 'master' of http://github.com/lhr530124/nozomiServer into sortedScore

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

Conflicts:
	config.py
init UserRank init ScoreCOunt
testLogin new User
database password
testUser
Merge branch 'sortedScore' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	test/testUser.py
find default 1
Merge branch 'sortedScore' of http://github.com/liyonghelpme/nozomiServer into mlhr
before merge
Merge branch 'master' of http://github.com/lhr530124/nozomiServer into sortedScore

Conflicts:
	app.py
	app2.py
	module/UserRankModule.py
fix testTimeOut  use post to access login
findEnemy return 1 user
add chat room
before merge cn server code
before commit to cn server