clean up
Merge branch 'frontend-master'
notificationService added
Merge branch 'master' into frontend-master