publish
Merge remote-tracking branch 'origin/master'

Conflicts:
	FrameWork1/RuleClass/Gen/User/UserAlbumTypeManageGen.php
publish