up
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
add
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Home/View/layout.html
	Application/Runtime/Cache/Home/09f8deeb46a93f00fbca61df3c800462.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php