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

Conflicts:
	Admin/Home/Controller/MessageController.class.php
	Application/Runtime/Cache/Home/c97a5ee1e0167c8fd9b84a9f58a78404.php
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php