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

Conflicts:
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Logs/Home/14_12_24.log
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php