Some fixes in profile.module (fields with IDs 18,19,20 not showing)

Well, it took me to add 18 fields to the profile until this weird bug popped up. There is an old piece of code from May 12 (probably used for debugging) in profile.module that creates this problem. Somebody really did not like numbers 18,19 and 20 :)

if ($field->fid == 18 || $field->fid == 19 || $field->fid == 20) {
  	     return;
}

The patch also fixes a small bug in displaying the user fields (should be ordered by category, then weight, not just weight).