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

Conflicts:
	Application/Home/View/layout.html
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Cache/Home/46332caeb04b047fd87fdfb87d6df375.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Application/Runtime/Cache/Home/6315a3b60704959f9f99b5b720e4544a.php
	Discuz/upload/data/log/201412_errorlog.php