TKT334 preference display organization icon from people
resolve merge conflicts. closes gh-334
remove unnecessary field from edit person. related to gh-334