federation ui
Merge pull request #571 from patriot1burke/master

federation ui