removed password field from user change form
some customization to trainee admin interface. involves some changes to models.
resolved conflicts