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

Conflicts:
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Logs/Home/14_12_22.log
	Bbs/Runtime/Logs/Home/14_12_22.log