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

Conflicts:
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Discuz/upload/data/log/201412_errorlog.php
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_26.log