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

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

Conflicts:
	Application/Runtime/Logs/Home/14_12_25.log
sdd
a
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_26.log
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
add
add
aa
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Home/View/layout.html
	Application/Runtime/Cache/Home/1215eaaed14e887624353daa3a7401fa.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Logs/Home/14_12_27.log
	Application/Runtime/Logs/Home/14_12_28.log
	Application/Runtime/Logs/Home/14_12_29.log
	Discuz_X3.2_SC_UTF8/upload/data/template/1_1_common_header_forum_guide.tpl.php
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_29.log
add