文章基础类
Merge branch 'master' of phpyrb:mwei0321/PhPyRb

Conflicts:
	.gitignore
	PhPyRb/Conf/config.php
	PhPyRb/Lib/Action/IndexAction.class.php
	PhPyRb/Tpl/index.html