Julian Lam a9753d7f52 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	less/category.less
	templates/account/edit.tpl
	templates/groups/details.tpl
..
list.tpl
memberlist.tpl Merge remote-tracking branch 'origin/master' into user-icons