Fixed sorting
Merge commit '579b62318cb550bc6373ac7ceaf774c5dc095c2a'

Conflicts:
	website/edit.php