commit
jjj
slist
Merge branch 'master' of github.com:ycaihappy/mu

Conflicts:
	code/webroot/themes/classic/views/uehome/user/slist.php
Merge branch 'master' of github.com:ycaihappy/mu