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

Conflicts:
	Admin/Runtime/Cache/Home/5f6a67897a921cec7e65c2bca83f8582.php
	Admin/Runtime/Cache/Home/61f884442aa4ee65b42c2199714335d1.php
	Admin/Runtime/Cache/Home/8011925855662aa355c7758a705c16d3.php
	Admin/Runtime/Cache/Home/804b7cf88273dd2fecb7afc145611b9d.php
	Admin/Runtime/Cache/Home/f00e8a5dbd3a4707b2230ff20a60eccb.php
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Application/Runtime/Cache/Home/8ed741b6da9e3cf0b06484dfb6809ef8.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
	Application/Runtime/Logs/Home/14_12_29.log