clear mysql log
1  connnect to master
2 connect to slave nozomi2 database

Conflicts:

	app.py
fix database connect
fix what ?
1000score
联盟战斗 比赛 startClanWar  设置app.py start时间和结束时间  rewardClanWar 分发奖励
false debug
check Clan in War then add score not don't add
startClanWar updateDb update different web server
hack news
sendhack new everyday when 22:00 ban users
fix utfencode error filter 4byte

Conflicts:

	app.py
	util.py
nozomi filter name
开启 联盟战斗cup
Merge branch 'mainServer' of github.com:lhr530124/nozomiServer into mainServer

Conflicts:
	startApp.sh
clear Score2
test Clan 2
league war
when leave clan not minus score
Merge branch 'mainServer' of http://github.com/lhr530124/nozomiServer into aliyun

Conflicts:
	app.py
	config.py
	startApp.sh
	test/testLogin.py