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

Conflicts:
	Application/Runtime/Logs/Home/14_12_22.log
sdf
df
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_22.log
	Discuz/upload/data/cache/qrcode/qr_index.jpg
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php