changing group model to organization model
Merge branch 'development'