Add organization serializer
Merge branch 'master' into org_sidebar