针对活动板块的开发
Merge branch 'master' of https://github.com/tealun/Tchat

Conflicts:
	Application/Install/Data/tchat.sql