Merge pull request #570 from patriot1burke/master

federation refactor
Merge pull request #571 from patriot1burke/master

federation ui
federation display name
fed ui
Merge remote-tracking branch 'upstream/master'