Revert "xx"

This reverts commit 7351d37a67f6124f2d256214548809df0e81fd00.
Merge origin/master

Conflicts:
	Rules/Gen/User/UserAlbumGen.php