database changes
Merge branch 'develop'

agregate connection database
agregate
Merge branch 'group'
Merge branch 'develop' into group
reparation views
notes