沙发页
Merge remote-tracking branch 'origin/master'

Conflicts:
	class/User.class.php