a
Merge branch 'master' of github.com:123jian/bbs

Conflicts:
	Application/Home/Conf/config.php