Merge branch 'master' of https://github.com/jianghust/ofs

Conflicts:
	views/widget/top.php
Merge branch 'master' of https://github.com/jianghust/ofs
by jiangzhibin