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

Conflicts:
	Admin/Runtime/Cache/Home/804b7cf88273dd2fecb7afc145611b9d.php
	Admin/Runtime/Cache/Home/cc981a9e5c21c8e2d43b2a9367330c6a.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/46332caeb04b047fd87fdfb87d6df375.php
	Application/Runtime/Logs/Home/14_12_29.log
sdf
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Home/View/Index/index.html
	Application/Runtime/Cache/Home/09f8deeb46a93f00fbca61df3c800462.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/46332caeb04b047fd87fdfb87d6df375.php
	Application/Runtime/Cache/Home/6315a3b60704959f9f99b5b720e4544a.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.php
	Application/Runtime/Cache/Home/8ed741b6da9e3cf0b06484dfb6809ef8.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
	Application/Runtime/Cache/Home/c97a5ee1e0167c8fd9b84a9f58a78404.php
	Application/Runtime/Logs/Home/14_12_29.log