Merge branch 'development'
fixing notifications