Merge pull request #755 from patriot1burke/master

admin console and model attributes
Merge pull request #756 from patriot1burke/master

freeotp
oauth id in admin console
Merge remote-tracking branch 'upstream/master'