fix score bug
Merge branch 'mlhr' of http://github.com/liyonghelpme/nozomiServer into mlhr
fix database
Merge branch 'mlhr' of http://github.com/liyonghelpme/nozomiServer into mlhr

Conflicts:
	test/testTimeout.py
fix findEnemy bug
fix getUserRank bug
add ab test examples
Merge branch 'mlhr' of http://github.com/liyonghelpme/nozomiServer into fixBug

Conflicts:
	test/testTimeout.py
all test files and test data
fix testUser
fix testConfig
optimize getRange performance
Merge branch 'fixBug' of https://github.com/liyonghelpme/nozomiServer into fixBug
localconfig
fix test example and database config
fix sortedScore  from great to small sort
test performance
nginx interface confi
changed the builds
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