Merge pull request #420 from patriot1burke/master

admin rest example, default origins, effect roles
stuff
Merge remote-tracking branch 'upstream/master'
jaxrs-doclet support