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

Conflicts:
	Application/Home/View/Index/index.html
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/6315a3b60704959f9f99b5b720e4544a.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
	Application/Runtime/Logs/Home/14_12_29.log