Added admin and company_id fields to Users, fields to edit user and new user screen