Merge branch 'restdoc-principals' of https://github.com/sathomas/Hilary into restdoc-principals
Follow up on oae-principals REST documentation
Merge branch 'master' of https://github.com/oaeproject/Hilary into restdoc