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

Conflicts:
	Application/Runtime/Cache/Home/09f8deeb46a93f00fbca61df3c800462.php
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
	Application/Runtime/Logs/Home/14_12_29.log