merge english chat server code
testClan code
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn

Conflicts:
	config.py
change default position of the zombie camp.
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn
clan Module
english not print testTimeOut
commit for edit clan info
add record url support
add server error log app.py
Merge branch 'chinese' of ssh://github.com/lhr530124/nozomiServer into chinese
get all access statistics data
rank before request
after request
internal error
update rank code
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn

Conflicts:
	config.py
delete the 'login count' code when login.
Merge branch 'chinese' of ssh://github.com/lhr530124/nozomiServer into chinese
Merge branch 'chinese' of github.com:lhr530124/nozomiServer into mcn

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