test performance
nginx interface confi
commit before update
Merge branch 'master' of http://github.com/lhr530124/nozomiServer into sortedScore

Conflicts:
	app.py
	app2.py
init UserRank init ScoreCOunt
testLogin new User
database password
find default 1
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 commit to cn server
merge english chat server code
testClan code
change default position of the zombie camp.
clan Module
commit for edit clan info
add record url support
add server error log app.py