tool_mergeusers: Simplify and correct getCurrentUserFieldNames()
Update deprecated icons
Merge pull request #54 from MorrisR2/master

tool_mergeusers: Simplify and correct getCurrentUserFieldNames()
Merge pull request #55 from MorrisR2/update_deprecated_icons

Update deprecated icons