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

Conflicts:
	user.php