Added the OrganizationPricipal and query
Merge branch 'master' of https://github.com/jherson/sfa-oauth