ASDFG
dgfdg
asdas
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Cache/Home/5f6a67897a921cec7e65c2bca83f8582.php
	Application/Runtime/Logs/Home/14_12_29.log
	Discuz_X3.2_SC_UTF8/upload/data/template/1_1_common_header_forum_index.tpl.php