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

Conflicts:
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/b1d2f525b5f86616759022a0bb428579.php
	Application/Runtime/Logs/Home/14_12_25.log