merge
Merge branch 'wall_style' into development
delete_notifications