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

Conflicts:
	Admin/Runtime/Cache/Home/e6aa195ed9129bd5d2fe87d782a86066.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.php