Renamed group model to Area
Merge branch 'rename-group-model' into develop