add change of clan battle
add changes
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