Init OrganizationEditForm Affinitic refs #5887
Merge branch 'master' of github.com:affinitic/ric.core