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

Conflicts:
	Application/Runtime/Logs/Home/14_12_22.log
	Bbs/Home/Controller/ForumController.class.php
	Bbs/Runtime/Logs/Home/14_12_22.log