Added rhine sort
Merge remote-tracking branch 'origin/master'

Conflicts:
	real code/Groups/templates/edit_profile