revocation
Merge remote-tracking branch 'upstream/master'
revocation ui
fix login.ftl page
Merge pull request #259 from patriot1burke/master

revocation and fix login.ftl