哈哈哈哈
Signed-off-by: gzy <450340999@qq.com>
Merge branch 'master' of github.com:kun1994/bbs

Conflicts:
	Application/Home/View/Index/index.html
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Logs/14_12_17.log
Merge branch 'master' of github.com:kun1994/bbs
Merge branch 'master' of github.com:kun1994/bbs

Conflicts:
	Application/Runtime/Logs/14_12_17.log

Signed-off-by: gzy <450340999@qq.com>