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

Conflicts:
	Admin/Runtime/Cache/Home/47491a116fe9b7d9a5649543a56e05e7.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Logs/Home/14_12_30.log